Remove conflict lines.