Fix bad merge commit