removed some merge issue residue