Update .kodiak.toml (carbon-design-system#13065)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
GalvinGao · Jan 31, 2023 · 3e7357e · 3e7357e
1 parent 227bd66
commit 3e7357e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.kodiak.toml b/.kodiak.toml
@@ -2,5 +2,6 @@
 version = 1
 
 [merge]
-automerge_label = "status: ready to merge 🎉"
+automerge_label = ["status: ready to merge 🎉", "status: enable automerge 🟠"]
+notify_on_conflict = "false"
 method = "squash"