hotfix: change update method and fix typo

Git merge was first used, however this created a new commit in the history which was unintended. This was then swapped over to rebasing

.github/workflows/Auto-update-develop.yml

@@ -3,11 +3,12 @@ name: Auto update develop branch
 on:
   push:
     branches:
-      - main
+      - main # Trigger on pushes to main branch
+  workflow_dispatch:  # Allow manual triggering
 
 jobs:
   auto-merge:
-    runs-on: ubuntu-ladevelop
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
@@ -17,5 +18,5 @@ jobs:
           git config user.name github-actions
           git config user.email [email protected]
           git checkout develop
-          git merge --no-ff origin/main
-          git push origin develop
+          git rebase origin/main
+          git push --force-with-lease origin develop