diff --git a/app/views/reports/index.html.erb b/app/views/reports/index.html.erb
index 4c85af544..149eb3772 100644
--- a/app/views/reports/index.html.erb
+++ b/app/views/reports/index.html.erb
@@ -46,18 +46,3 @@
     </div>
   <% end %>
 </div>
-<<<<<<< HEAD
-
-<div id="actionToolbar" data-behaviour="vue">
-  <action-toolbar actions-url="<%= actions_toolbar_reports_url %>" />
-</div>
-
-<%= render partial: 'reports/modals/regenerate' %>
-
-<%= javascript_include_tag "vue_components_action_toolbar" %>
-<%= javascript_include_tag 'reports/save_pdf_to_inventory' %>
-<%= javascript_include_tag 'reports/reports_datatable' %>
-<%= javascript_include_tag 'pdf_js' %>
-<%= stylesheet_link_tag 'pdf_js_styles' %>
-=======
->>>>>>> develop