Obviously the changes made in C and D nonetheless can conflict with what was performed by any from the x, but that is certainly just a traditional merge conflict." This is simply not generally a bug—actually, some truly hairy reduced-level algorithms do this on purpose—but it really must commonly be avoided. @Steve Gury give's a very good examp