diff --git a/.mergify.yml b/.mergify.yml
index 15fd5333b..0e69730f6 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -7,6 +7,15 @@ pull_request_rules:
       dismiss_reviews:
         approved: true
         changes_requested: false
+  - name: ask to resolve conflict
+    conditions:
+      - conflict
+    actions:
+      comment:
+        # yamllint disable-line rule:truthy
+        message: "This pull request now has conflicts with the target branch.
+        Could you please resolve conflicts and force push the corrected
+        changes? 🙏"
   - name: automatic merge
     conditions:
       - label!=DNM