Rebase one more time