diff --git a/.github/workflows/publish_api_documentation.yml b/.github/workflows/publish_api_documentation.yml
index e448b0fb..9f6fa41e 100644
--- a/.github/workflows/publish_api_documentation.yml
+++ b/.github/workflows/publish_api_documentation.yml
@@ -38,5 +38,5 @@ jobs:
         git status
         git commit -m "Publish API documentation"
         git checkout gh-pages
-        git merge 3.0
+        git merge 3.0 -X theirs
         git push