Removing conflict residue.