diff --git a/.github/workflows/bitbucket-sync-test.yml b/.github/workflows/bitbucket-sync-test.yml
index 598d458..bd6fce3 100644
--- a/.github/workflows/bitbucket-sync-test.yml
+++ b/.github/workflows/bitbucket-sync-test.yml
@@ -49,5 +49,5 @@ jobs:
         run: git config --global user.email "organisation-name@github.com" && git config --global user.name "GitHub Action Runner"
       
       - name: Fix merge conflicts if any
-        run: git pull --rebase upstream main
+        run: git pull --rebase -s recursive -X ours upstream main