Rebase from the correct branch