Remove conflict line.