rebase aftermath