fix conflit

app/views/origami/commissioners/show.html.erb

@@ -0,0 +1,39 @@
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li><a href="<%= root_path %>">Home</a></li>
+  <li><a href="<%= commissioners_path %>">Commissioners</a></li>
+
+  <span style="float: right">
+  </span>
+ </ul>
+</div>
+<div class="card">
+  <div class="card-block">
+    <h4 class="card-title">Commissioner</h4>
+    <table class="table">
+
+      <tbody>
+
+          <tr><td style="width:20%">Name</td><td><%= @commissioner.name  %></td></tr>
+          <tr><td style="width:20%">Employee Name</td>
+          <td>
+                 <% if Employee.exists? %>
+                 <% employee = Employee.where('emp_id=?',@commissioner.emp_id) %>
+                 <%= employee[0].name %>
+                 <% end %>
+
+                </td></tr>
+          <tr><td style="width:20%">Commission Type</td><td><%= @commissioner.commission_type %></td></tr>
+          <tr><td style="width:20%">Active</td><td><%= @commissioner.is_active %></td></tr>
+          <tr><td style="width:20%">Created By</td><td><%= current_user.name %></td></tr>
+
+
+          <tr><td style="width:20%"><%= link_to 'Edit', edit_commissioner_path(@commissioner) %></td><td><%= link_to 'Destroy', commissioner_path(@commissioner), method: :delete, data: { confirm: 'Are you sure?' } %></td></tr>
+
+
+      </tbody>
+    </table>
+  </div>
+</div>
+
+</div>