diff --git a/.mergify.yml b/.mergify.yml
index 984017466..d02925c87 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,18 +1,4 @@
 pull_request_rules:
-  - name: ask to resolve conflict
-    conditions:
-      - conflict
-    actions:
-        comment:
-          message: |
-            This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
-            To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
-            ```
-            git fetch upstream
-            git checkout -b {{head}} upstream/{{head}}
-            git merge upstream/{{base}}
-            git push upstream {{head}}
-            ```
   - name: Automatic squash and merge on approval with success checks and ready-to-merge label
     conditions:
       - "#approved-reviews-by>=2"