diff --git a/.mergify.yml b/.mergify.yml
index 53596060b1f..1ed5e32bbed 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -2,29 +2,27 @@ pull_request_rules:
   - name: Auto-close PRs on stable branch
     conditions:
       - and:
-        - and:
-          - author!=surajshetty3416
-          - author!=gavindsouza
-          - author!=rohitwaghchaure
-          - author!=nabinhait
-          - author!=ankush
-          - author!=deepeshgarg007
-          - author!=frappe-pr-bot
-          - author!=mergify[bot]
-
-        - or:
-          - base=version-13
-          - base=version-12
-          - base=version-14
-          - base=version-15
-          - base=version-16
+          - and:
+              - author!=surajshetty3416
+              - author!=gavindsouza
+              - author!=rohitwaghchaure
+              - author!=nabinhait
+              - author!=ankush
+              - author!=deepeshgarg007
+              - author!=frappe-pr-bot
+              - author!=mergify[bot]
+          - or:
+              - base=version-13
+              - base=version-12
+              - base=version-14
+              - base=version-15
+              - base=version-16
     actions:
       close:
       comment:
-          message: |
-            @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
-            https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
-
+        message: |
+          @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch.
+          https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
   - name: backport to develop
     conditions:
       - label="backport develop"
@@ -34,7 +32,6 @@ pull_request_rules:
           - develop
         assignees:
           - "{{ author }}"
-
   - name: backport to version-14-hotfix
     conditions:
       - label="backport version-14-hotfix"
@@ -44,7 +41,6 @@ pull_request_rules:
           - version-14-hotfix
         assignees:
           - "{{ author }}"
-
   - name: backport to version-15-hotfix
     conditions:
       - label="backport version-15-hotfix"
@@ -54,18 +50,6 @@ pull_request_rules:
           - version-15-hotfix
         assignees:
           - "{{ author }}"
-
-  - name: backport to version-13-hotfix
-    conditions:
-      - label="backport version-13-hotfix"
-    actions:
-      backport:
-        branches:
-          - version-13-hotfix
-        assignees:
-          - "{{ author }}"
-
-
   - name: Automatic merge on CI success and review
     conditions:
       - status-success=linters
@@ -96,6 +80,6 @@ pull_request_rules:
       merge:
         method: squash
         commit_message_template: |
-            {{ title }} (#{{ number }})
+          {{ title }} (#{{ number }})
 
-            {{ body }}
+          {{ body }}