Merge conflicts

Author: lcawl

.mergify.yml

@@ -13,8 +13,6 @@ pull_request_rules:
             git merge upstream/{{base}}
             git push upstream {{head}}
             ```
-<<<<<<< HEAD
-=======
   - name: backport patches to 8.17 branch
     conditions:
       - merged
@@ -43,7 +41,6 @@ pull_request_rules:
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
         labels:
           - backport
->>>>>>> a14abe67 (Update .mergify.yml (#5958))
   - name: backport patches to 8.15 branch
     conditions:
       - merged