Deleted merge conflict