diff --git a/modules/openstack_project/files/zuul/black.png b/modules/openstack_project/files/zuul/black.png
new file mode 100644
index 0000000000..0d1c61fb4f
Binary files /dev/null and b/modules/openstack_project/files/zuul/black.png differ
diff --git a/modules/openstack_project/files/zuul/status.js b/modules/openstack_project/files/zuul/status.js
index 0c22ec3218..31054add80 100644
--- a/modules/openstack_project/files/zuul/status.js
+++ b/modules/openstack_project/files/zuul/status.js
@@ -227,8 +227,12 @@ function format_change(change, change_queue) {
         html += '<td class="'+cls+'">';
         if (i == change['_tree_index']) {
             if (change['failing_reasons'] && change['failing_reasons'].length > 0) {
-                html += '<img src="red.png" title="Failing because '+
-                    change['failing_reasons'].join(', ')+'"/>';
+                var reason = change['failing_reasons'].join(', ');
+                var image = 'red.png';
+                if (reason.match(/merge conflict/)) {
+                    image = 'black.png';
+                }
+                html += '<img src="' + image + '" title="Failing because ' + reason +'"/>';
             } else {
                 html += '<img src="green.png" title="Succeeding"/>';
             }