didn't check in a conflict resolution change correctly