Fix bad merge

fix bad merge