From 1af683ee9041b1e1526a8696027e0d2198114432 Mon Sep 17 00:00:00 2001
From: ike709 <ike709@users.noreply.github.com>
Date: Mon, 13 Jun 2022 11:45:23 -0500
Subject: [PATCH] Revert "Remove merge conflict comment" (#8820)

---
 .github/workflows/conflict-labeler.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
index 68666aa755..fd832b9231 100644
--- a/.github/workflows/conflict-labeler.yml
+++ b/.github/workflows/conflict-labeler.yml
@@ -15,3 +15,4 @@ jobs:
         with:
           dirtyLabel: "Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."