diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index f0ec972b221..195ab179f50 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Attempt to merge head into base
       id: merge
       run: |
-        git merge --no-ff --no-commit ${{ github.event.inputs.head }} || echo "Merge conflict detected" > conflict.txt
+        git merge --no-ff --no-commit ${{ github.event.inputs.head }} --allow-unrelated-histories || echo "Merge conflict detected" > conflict.txt
 
     - name: Check for merge conflicts
       id: check-conflict