diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml
index 9450a31..989a9ac 100644
--- a/.gitea/workflows/convert-to-yml.yml
+++ b/.gitea/workflows/convert-to-yml.yml
@@ -35,7 +35,7 @@ jobs:
           git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
           git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }}
           git fetch
-          git merge origin/master --allow-unrelated-histories 
+          git merge origin/master --allow-unrelated-histories --strategy-option=ours
           git push origin HEAD:${{ env.PRODUCTION_BRANCH }}
       - name: make pull request
         run: |