missed deleting a line after merge conflict