Prepare for rebase