Remove conflict lines