Remove conflict line