![Clark Boylan](/assets/img/avatar_default.png)
The zuul pipeline reporter for merge-failure has been renamed to merge-conflict. The old name has been depreacted and will be removed in a future release. Update our examples to match Zuul's current expectations. Change-Id: I1f9effa311163d942171e35ba65fafa25245e9d2