Fix the merge conflict detection.