Fix conflict resolution gone wrong