preparing to rebase