Resolve a merge conflict that is missed