diff --git a/.github/workflows/global-npm-resolve-conflicting-files-fix.yml b/.github/workflows/global-npm-resolve-conflicting-files-fix.yml
index f7eb39fba..b05adffcf 100644
--- a/.github/workflows/global-npm-resolve-conflicting-files-fix.yml
+++ b/.github/workflows/global-npm-resolve-conflicting-files-fix.yml
@@ -29,7 +29,7 @@ jobs:
         run: |
           git fetch origin
           git checkout ${{ github.head_ref }}
-          git merge origin/master --strategy=ours --allow-unrelated-histories
+          git merge origin/master --strategy=theirs --allow-unrelated-histories
 
       - name: Resolve package-lock.json conflicts
         run: |