Merge all commits on "master" into "main"

No need to have two branches, right? "main" is the default branch so we can merge into that. I think we should try and push to one branch ("main") from now on.