resolve conflicts in app/views/layouts/nav/sidebar/_project.html.haml

app/views/layouts/nav/sidebar/_project.html.haml

@@ -79,14 +79,11 @@
             = nav_link(path: 'graphs#charts') do
               = link_to charts_project_graph_path(@project, current_ref) do
                 = _('Charts')
-<<<<<<< HEAD
 
             - if @project.feature_available?(:file_locks)
               = nav_link(controller: [:path_locks]) do
                 = link_to project_path_locks_path(@project) do
-                  #{ _('Locked Files') }
-=======
->>>>>>> upstream/master
+                  = _('Locked Files')
 
       - if project_nav_tab? :issues
         = nav_link(controller: @project.issues_enabled? ? [:issues, :labels, :milestones, :boards] : :issues) do
@@ -121,14 +118,11 @@
               = link_to project_labels_path(@project), title: 'Labels' do
                 %span
                   = _('Labels')
-<<<<<<< HEAD
 
             - if EE::Gitlab::ServiceDesk.enabled?(project: @project)
               = nav_link(controller: :issues, action: :service_desk ) do
                 = link_to service_desk_project_issues_path(@project), title: 'Service Desk' do
                   %span Service Desk
-=======
->>>>>>> upstream/master
 
             = nav_link(controller: :milestones) do
               = link_to project_milestones_path(@project), title: 'Milestones' do
@@ -340,11 +334,8 @@
                   = link_to project_pages_path(@project), title: 'Pages' do
                     %span
                       = _('Pages')
-<<<<<<< HEAD
 
               = render 'projects/settings/ee/nav'
-=======
->>>>>>> upstream/master
 
       - else
         = nav_link(controller: :project_members) do