Obviously the modifications manufactured in C and D even now can conflict with what was completed by any from the x, but that's just a standard merge conflict.You can follow these actions to revert the incorrect dedicate(s) or to reset your remote department back to right HEAD/point out.DaedalusDaedalus 41644 silver badges1818 bronze badges 1 Once