diff --git a/triagebot.toml b/triagebot.toml
index 5648018b..61be91bf 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -2,3 +2,9 @@
 
 [relabel]
 
+[shortcut]
+
+[merge-conflicts]
+remove = []
+add = ["S-waiting-on-author"]
+unless = ["S-blocked", "S-waiting-on-review"]