Update the main branch with the gh-pages branch, and set the github.io publishing branch to main instead of gh-pages
Update the main branch with the gh-pages branch, and set the github.io publishing branch to main instead of gh-pages