Fix bad merge commit

Fix bad merge commit