Merge origin/main and resolve asset conflicts

Co-authored-by: HeyItsGilbert <615265+HeyItsGilbert@users.noreply.github.com>

Author: Copilot

package.json

@@ -16,5 +16,8 @@
     "node-fetch": "^3.3.2",
     "purgecss": "^5.0.0",
     "subset-font": "^2.5.0"
+  },
+  "allowScripts": {
+    "hugo-extended@0.152.2": true
   }
 }