<%= l(:notice_issue_update_conflict) %> <% if @conflict_journals.present? %>
<% @conflict_journals.sort_by(&:id).each do |journal| %>

<%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>

<% if journal.details.any? %> <% end %>
<%= textilizable(journal, :notes) unless journal.notes.blank? %>
<% end %>
<% end %>


<% if @issue.notes.present? %>
<% end %>

<%= submit_tag l(:button_submit) %>