Fix bad rebase