Fix conflict in project.html

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

@@ -347,13 +347,7 @@
                   = link_to project_settings_ci_cd_path(@project), title: _('CI / CD') do
                     %span
                       = _('CI / CD')
-<<<<<<< HEAD
-
-              = render_if_exists 'projects/sidebar/settings_operations'
-
-=======
               = render_if_exists 'projects/sidebar/settings_operations'
->>>>>>> upstream/master
               - if @project.pages_available?
                 = nav_link(controller: :pages) do
                   = link_to project_pages_path(@project), title: _('Pages') do