Investigate using merge queues to remove Magician merge timing issues

[rileykarson]

While not often a problem on main, feature branches have timing issues at the moment. We should investigate whether or not GitHub merge queues could help alleviate the issue: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

These were released July 12, so a little after we'd implemented the feature branch system for 5.0.0

[melinath]

We just enabled merge queues for main - they are not currently enabled for feature branches but I think it should be fairly easy to do at this point.