removing conflict residue