diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml
index 608b989552d..60d1c01462a 100644
--- a/.github/workflows/fork-sync.yml
+++ b/.github/workflows/fork-sync.yml
@@ -47,7 +47,7 @@ jobs:
       run: |
         git checkout main
         git pull origin main
-        git merge upstream/main --no-ff --no-edit
+        git merge upstream/main --no-ff --no-edit --allow-unrelated-histories
         git push origin main
 
     - name: Check and update package.json name field if needed
@@ -70,7 +70,7 @@ jobs:
       env:
         GH_TOKEN: ${{ github.token }}
       run: |
-        git tag ${{ steps.get_latest_tag.outputs.latest_tag }}
+        git tag -f ${{ steps.get_latest_tag.outputs.latest_tag }}
         git push origin --tags
 
     - name: Publish to npm