fixed conflict

app/views/settings/menu_item_instances/new.html.erb

@@ -1,16 +1,20 @@
 <!-- <h1>New Settings Menu Item</h1>
 
+<<<<<<< HEAD
 <%= render 'form', settings_menu_item: @settings_menu_item %>-->
 
 
+
 <div class="span12">
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
+
 			<li><a href="<%= settings_menu_category_simple_menu_item_path(@category,@item) %>">Menu Category</a></li>
 			<li>Menu Item</li>
 		  	<li>New Menu Item Instance</li>
 		 </ul>
 		</div>
     <%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances %>
+
 </div>