Merge main into course and resolve conflicts

Author: Douglasymlai

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: publish-to-github-pages
 on:
   push:
     branches:
-      - main
+      - course
 
 permissions:
   contents: read