Resolve conflict in config/prometheus/additional_metrics.yml

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

config/prometheus/additional_metrics.yml

@@ -160,12 +160,8 @@
     queries:
     - query_range: 'sum(avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}"}[2m])) without (job)) * 100'
       label: Average
-<<<<<<< HEAD
       unit: "%"
     - query_range: 'sum(avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}-canary"}[2m])) without (job)) * 100'
       label: Average
       unit: "%"
       track: canary
-=======
-      unit: "%"
->>>>>>> upstream/master