diff --git a/triagebot.toml b/triagebot.toml
index 4a29166cb..5888defef 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -6,3 +6,8 @@ allow-unauthenticated = [
 [assign]
 
 [shortcut]
+
+[merge-conflicts]
+remove = []
+add = ["S-waiting-on-author"]
+unless = ["S-blocked", "S-waiting-on-team", "S-waiting-on-review"]