Resolve conflict in lib/gitlab/usage_data.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

lib/gitlab/usage_data.rb

@@ -28,10 +28,7 @@ module Gitlab
             deploy_keys: DeployKey.count,
             deployments: Deployment.count,
             environments: ::Environment.count,
-<<<<<<< HEAD
             geo_nodes: GeoNode.count,
-=======
->>>>>>> upstream/master
             in_review_folder: ::Environment.in_review_folder.count,
             groups: Group.count,
             issues: Issue.count,