diff --git a/.github/workflows/tag-push.yml b/.github/workflows/tag-push.yml
index 634f6ad74..87a1a3d3f 100644
--- a/.github/workflows/tag-push.yml
+++ b/.github/workflows/tag-push.yml
@@ -55,5 +55,5 @@ jobs:
           git config --local user.name "github-actions[bot]"
           git status
           git fetch origin
-          git merge origin/develop
+          git merge origin/develop -X theirs
           git push origin main