rebase prep