a merge conflict escaped