Remove conflict resolution residue