removing merge residue