Merge pull request #1055 from kumvijaya/current

T7878: Using mergify rule to handle conflict checks for private repo - updated label

Author: kumvijaya

.github/mergify.yml

@@ -7,4 +7,4 @@ pull_request_rules:
     actions:
       label:
         toggle:
-          - conflict
+          - conflicts