rebase the code