diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 6f01bf65c..43535153d 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -60,31 +60,6 @@
 <% end %>
 
 
-<<<<<<< HEAD
-<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post"} do |f| %>
-<div id="pro_st_edit_ku" class="pro_st_edit_ku">
-  <ul>
-    <li >
-      <label class="label02"><%=l(:label_scm)%>：</label>
-      <%= label_tag('repository_scm',
-                     options_for_select(["Git"],@repository.class.name.demodulize),
-                     :data => {:remote => true, :method => 'get'})%>
-      <% if @repository && ! @repository.class.scm_available %>
-          <span class="c_grey"><%= l(:text_scm_command_not_available) %></span>
-      <% end %>
-    </li>
-    <% unless judge_main_repository(@project) %>
-        <li>
-            <label class="label02"><%=l(:field_repository_is_default)%>：</label>
-            <%= f.check_box :is_default, :label => "", :no_label => true %></p>
-        </li>
-    <% end %>
-    <li >
-      <label class="label02"><span class="c_red">*</span><%=l(:label_repository_name)%>：</label>
-      <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %>
-      <% unless @repository.identifier_frozen? %>
-         <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
-=======
 <% if @project.repositories.any? %>
     <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %>
     <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %>
@@ -109,7 +84,6 @@
                 <td class="w360" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
             <% end %>
           </tr>
->>>>>>> develop
       <% end %>
       </tbody>
     </table>