Fix merge

Author: arriolac

.github/workflows/sync_main_latest.yml

@@ -1,5 +1,6 @@
 name: Sync main and latest
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -16,7 +17,7 @@ jobs:
         run: git config user.email "[email protected]" && git config user.name "compose-devrel-github-bot"
 
       - name: Merge main into latest
-        run: git checkout latest && git merge main
+        run: git fetch && git switch latest && git merge -s ours origin/main --allow-unrelated-histories
 
       - name: Create pull request
         id: cpr

.github/workflows/update_deps.yml

@@ -19,7 +19,7 @@ jobs:
         run: ./gradlew versionCatalogUpdate
       - name: Create pull request
         id: cpr
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.PAT }}
           commit-message: 🤖 Update Dependencies