rebase should take care of this