Merge branch 'main' of https://github.com/eskirk/elliotkirk into dev

Author: eskirk

.github/workflows/dev.yml

@@ -21,6 +21,6 @@ jobs:
             cd elliotkirkdev
             nvm use 19.0.1
             git checkout dev
-            git pull origin dev
+            git pull -f origin dev
             yarn && yarn build
             echo "Deployed elliotkirkdev"

.github/workflows/main.yml

@@ -20,6 +20,6 @@ jobs:
             source ~/.nvm/nvm.sh
             cd elliotkirk
             nvm use 19.0.1
-            git pull
+            git pull -f origin main
             yarn && yarn build
             echo "Deployed elliotkirk"