Preparing for rebasing