Remove merge conflict line.