gosh now I know even less about rebase than I did before, which was nothing...