got rid of merge residue