[CE->EE] Resolve a last part of conflicts

lib/gitlab/usage_data.rb

@@ -27,11 +27,8 @@ module Gitlab
             deploy_keys: DeployKey.count,
             deployments: Deployment.count,
             environments: Environment.count,
-<<<<<<< HEAD
             geo_nodes: GeoNode.count,
-=======
             in_review_folder: Environment.in_review_folder.count,
->>>>>>> c00e5bfa065128c5212a991a5cfcb6f152981d51
             groups: Group.count,
             issues: Issue.count,
             keys: Key.count,

spec/lib/gitlab/usage_data_spec.rb

@@ -44,11 +44,8 @@ describe Gitlab::UsageData do
         deploy_keys
         deployments
         environments
-<<<<<<< HEAD
         geo_nodes
-=======
         in_review_folder
->>>>>>> c00e5bfa065128c5212a991a5cfcb6f152981d51
         groups
         issues
         keys

spec/models/merge_request_spec.rb

@@ -2018,7 +2018,6 @@ describe MergeRequest, models: true do
     end
   end
 
-<<<<<<< HEAD
   describe '#base_pipeline' do
     let!(:pipeline) { create(:ci_empty_pipeline, project: subject.project, sha: subject.diff_base_sha) }
 
@@ -2060,7 +2059,9 @@ describe MergeRequest, models: true do
 
     context 'without codeclimate artifact' do
       it { expect(subject.has_codeclimate_data?).to be_falsey }
-=======
+    end
+  end
+
   describe '#fetch_ref' do
     it 'sets "ref_fetched" flag to true' do
       subject.update!(ref_fetched: nil)
@@ -2094,7 +2095,6 @@ describe MergeRequest, models: true do
         .and_return(false)
 
       expect(subject.ref_fetched?).to be_falsey
->>>>>>> c00e5bfa065128c5212a991a5cfcb6f152981d51
     end
   end
 end