Rebase solution