fix an exception when only one side of a diff3 merge is change