Resolve conflicts in lib/gitlab/prometheus/queries/query_additional_metrics.rb

lib/gitlab/prometheus/queries/query_additional_metrics.rb

@@ -2,11 +2,8 @@ module Gitlab
   module Prometheus
     module Queries
       module QueryAdditionalMetrics
-<<<<<<< HEAD
         prepend EE::Gitlab::Prometheus::Queries::QueryAdditionalMetrics
 
-=======
->>>>>>> upstream/master
         def query_metrics(project, environment, query_context)
           matched_metrics(project).map(&query_group(query_context))
             .select(&method(:group_with_any_metrics))