Remove line that was created in a merge conflict