Needless to say the variations built in C and D even now can conflict with what was done by any in the x, but which is just a traditional merge conflict." This isn't normally a bug—in truth, some really hairy small-amount algorithms make this happen on intent—nevertheless it need to normally be averted. @Steve Gury give's a superb illustration