Fix for structure

app/views/admin/links/_form.html.erb

@@ -2,15 +2,9 @@
 <%= f.error_messages %>
 
 <%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %>
-
-<<<<<<< Updated upstream
-<%= f.label :name, t(:name) %>
-<%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
-=======
 <%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %>
 <%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
 <span class="help-block"><%= I18n.t("front_page.name_field_helper") %></span>
->>>>>>> Stashed changes
 
 <%= f.label :url, t(:url) %>
 <%= f.text_field :url, :class => 'input-xlarge', placeholder: t(:url) %>