manual rebase