diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb
index 01d668821..c13ace665 100644
--- a/app/views/issues/_conflict.html.erb
+++ b/app/views/issues/_conflict.html.erb
@@ -11,7 +11,9 @@
         <% end %>
       </ul>
       <% end %>
-      <%= textilizable(journal, :notes) unless journal.notes.blank? %>
+      <div class="wiki">
+        <%= textilizable(journal, :notes) unless journal.notes.blank? %>
+      </div>
     <% end %>
     </div>
   <% end %>