Lost in merge conflict resolution