fix conflit

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

@@ -0,0 +1,14 @@
+<%= simple_form_for(@commissioner) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+  	<%= f.input :name  %>
+    <%= f.collection_select :emp_id, Employee.all.order('name asc'), :emp_id, :name, {prompt: "Select an Employee"}, {class: "form-control"} %>
+    <%= f.input :commission_type %>
+    <label><%= f.check_box :is_active %> Active </label>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit %>
+  </div>
+<% end %>