handle merge conflict residue