Comment 6 for bug 1281592

Looks like we could just get rid of cs_commit/cs_shadow instead of trying to make it able to fix merge conflicts for shadow cib on fly (would be a waste of time, I believe), see https://bugs.launchpad.net/fuel/+bug/1283062/comments/7