Finished rebase