diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml
index 76143b8..1c33cec 100644
--- a/.gitea/workflows/automerge-with-core.yaml
+++ b/.gitea/workflows/automerge-with-core.yaml
@@ -25,7 +25,7 @@ jobs:
           git fetch upstream
       - run: |
           cd /repo
-          git rebase upstream/main
+          git rebase upstream/main -s ours
       - run: |
           cd /repo
           git log