oh I probably need to rebase to a more recent main anyway, maybe that's the issue