fix merge conflict residue