diff --git a/triagebot.toml b/triagebot.toml
index 511e43b76fa..35256be5866 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -28,6 +28,11 @@ label = "O-windows"
 
 [transfer]
 
+[merge-conflicts]
+remove = []
+add = ["S-waiting-on-author"]
+unless = ["S-blocked", "S-waiting-on-review"]
+
 [autolabel."S-waiting-on-review"]
 new_pr = true