fix conflit

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

@@ -0,0 +1,46 @@
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li><a href="<%=  %>">Home</a></li>
+  <li>Commissioner</li>
+  <span style="float: right">
+    <%= link_to t('.new', :default => t("helpers.links.new")),new_commissioner_path,:class => 'btn btn-primary btn-sm' %>
+  </span>
+ </ul>
+</div>
+
+<br>
+<div class="card">
+  <table class="table table-striped">
+    <thead>
+    <tr>
+      <th>Name</th>
+      <th>Employee Name</th>
+      <th>Commission type</th>
+      <th>Active</th>
+      <th>Created By</th>
+      <th colspan="3"></th>
+    </tr>
+    </thead>
+
+    <tbody>
+    <% @commissioners.each do |commissioner| %>
+      <tr>
+        <td><%= commissioner.name %></td>
+        <td>
+                 <% if Employee.exists? %>
+                 <% employee = Employee.where('emp_id=?',commissioner.emp_id) %>
+                 <%= employee[0].name %>
+                 <% end %>
+
+                </td>
+        <td><%= commissioner.commission_type %></td>
+        <td><%= commissioner.is_active %></td>
+        <td><%= current_user.name %></td>
+        <td><%= link_to 'Show', commissioner_path(commissioner) %></td>
+        <td><%= link_to 'Edit', edit_commissioner_path(commissioner) %></td>
+        <td><%= link_to 'Destroy', commissioner_path(commissioner), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+  </table>
+</div>