solve some conflicts

app/helpers/nav_helper.rb

@@ -33,8 +33,6 @@ module NavHelper
   def nav_control_class
     "nav-control" if current_user
   end
-<<<<<<< HEAD
-=======
 
   def user_dropdown_class
     class_names = []
@@ -43,5 +41,4 @@ module NavHelper
 
     class_names
   end
->>>>>>> upstream/master
 end

app/models/ci/build.rb

@@ -462,14 +462,13 @@ module Ci
       trace
     end
 
-<<<<<<< HEAD
     def has_codeclimate_json?
       options.dig(:artifacts, :paths) == ['codeclimate.json'] &&
         artifacts_metadata?
-=======
+    end
+
     def serializable_hash(options = {})
       super(options).merge(when: read_attribute(:when))
->>>>>>> upstream/master
     end
 
     private

app/services/groups/update_service.rb

@@ -8,13 +8,10 @@ module Groups
       return false unless valid_visibility_level_change?(group, params[:visibility_level])
 
       return false unless valid_share_with_group_lock_change?
-<<<<<<< HEAD
 
       # Repository size limit comes as MB from the view
       limit = @params.delete(:repository_size_limit)
       group.repository_size_limit = Gitlab::Utils.try_megabytes_to_bytes(limit) if limit
-=======
->>>>>>> upstream/master
 
       group.assign_attributes(params)
 

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

@@ -136,7 +136,6 @@
               %strong.fly-out-top-item-name
                 #{ _('Abuse Reports') }
               %span.badge.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(AbuseReport.count(:all))
-<<<<<<< HEAD:app/views/layouts/nav/sidebar/_admin.html.haml
 
       = nav_link(controller: :licenses) do
         = sidebar_link admin_license_path, title: _('License') do
@@ -149,8 +148,6 @@
             = link_to admin_license_path do
               %strong.fly-out-top-item-name
                 #{ _('License') }
-=======
->>>>>>> upstream/master:app/views/layouts/nav/sidebar/_admin.html.haml
 
       - if akismet_enabled?
         = nav_link(controller: :spam_logs) do
@@ -164,7 +161,6 @@
               = link_to admin_spam_logs_path do
                 %strong.fly-out-top-item-name
                   #{ _('Spam Logs') }
-<<<<<<< HEAD:app/views/layouts/nav/sidebar/_admin.html.haml
 
       = nav_link(controller: :push_rules) do
         = sidebar_link admin_push_rule_path, title: _('Push Rules') do
@@ -189,8 +185,6 @@
             = link_to admin_geo_nodes_path do
               %strong.fly-out-top-item-name
                 #{ _('Geo Nodes') }
-=======
->>>>>>> upstream/master:app/views/layouts/nav/sidebar/_admin.html.haml
 
       = nav_link(controller: :deploy_keys) do
         = sidebar_link admin_deploy_keys_path, title: _('Deploy Keys') do