remove some merge residue