Botched rebase process