Not surprisingly the improvements built in C and D nonetheless can conflict with what was performed by any of your x, but that's just a traditional merge conflict. You could possibly abide by these actions to revert the incorrect commit(s) or to reset your distant department back to correct H