Remove residue of bad merge