Rebase the code