prepare for rebase