Obviously the improvements designed in C and D even now can conflict with what was done by any of your x, but that is definitely just a traditional merge conflict. I discovered very good rationalization for the way To Revert The Merge from this hyperlink and I duplicate pasted the explanation und