diff --git a/.mergify/config.yml b/.mergify/config.yml
index c54af97b38..78d3bdb3e8 100644
--- a/.mergify/config.yml
+++ b/.mergify/config.yml
@@ -1,7 +1,18 @@
 pull_request_rules:
     - name: Automatic merge on approval
       conditions:
+        - "label=automerge"
         - "#approved-reviews-by>=1"
+        - "#review-requested=0"
+        - "#changes-requested-reviews-by=0"
+        - "#commented-reviews-by=0"
       actions:
         merge:
-          method: merge
\ No newline at end of file
+          method: squash
+
+    - name: Ask to resolve conflict
+      conditions:
+        - conflict
+      actions:
+        comment:
+          message: This pull request is now in conflicts. Could you fix it? 🙏