Remove a merge conflict line