Switch the order so the rebase happens earlier