Remove conflict head