diff --git a/doc/source/third_party.rst b/doc/source/third_party.rst
index 240ebf45be..e6fd3e4152 100644
--- a/doc/source/third_party.rst
+++ b/doc/source/third_party.rst
@@ -306,11 +306,11 @@ Here’s a snippet from that file that constructs the ``check`` pipeline taken f
         failure:
           gerrit:
             verified: -1
-        merge-failure:
+        merge-conflict:
           smtp:
             to: third_party_ci@example.com
             from: zuul@example.com
-            subject: Upstream change {change} has a merge failure
+            subject: Upstream change {change} has a merge conflict
 
 
 This pipeline is configured to trigger on any Gerrit event that represents a new