[CE->EE] Resolve usage data files

lib/gitlab/usage_data.rb

@@ -63,12 +63,9 @@ module Gitlab
             deployments: Deployment.count,
             environments: ::Environment.count,
             gcp_clusters: ::Gcp::Cluster.count,
-<<<<<<< HEAD
             geo_nodes: GeoNode.count,
-=======
             gcp_clusters_enabled: ::Gcp::Cluster.enabled.count,
             gcp_clusters_disabled: ::Gcp::Cluster.disabled.count,
->>>>>>> 3fa410c831dac1dd1a74a14260ed99a5920218f8
             in_review_folder: ::Environment.in_review_folder.count,
             groups: Group.count,
             issues: Issue.count,

spec/lib/gitlab/usage_data_spec.rb

@@ -72,12 +72,9 @@ describe Gitlab::UsageData do
         deployments
         environments
         gcp_clusters
-<<<<<<< HEAD
         geo_nodes
-=======
         gcp_clusters_enabled
         gcp_clusters_disabled
->>>>>>> 3fa410c831dac1dd1a74a14260ed99a5920218f8
         in_review_folder
         groups
         issues