Resolve merge conflicts

signalfx-org-metrics/metrics.yaml

@@ -133,15 +133,11 @@ sf.org.apm.numSpanBytesReceivedByToken:
 sf.org.apm.numSpansDroppedBlocked:
   brief: The number of spans that APM was unable to process or has dropped due to a blocked trace or too many spans in the trace.
   description: |
-<<<<<<< HEAD
-    The number of spans that APM was unable to process or has dropped because the trace has a blocked trace ID or too many spans in the trace.
-=======
     The number of spans that APM was unable to process or has dropped. A span can be dropped for the following reasons: 
       * blockedTraceID: If any ingest endpoint reaches the 100k limit for spans in a given trace, then the trace is added to the list of blocked traces so that all the ingest endpoints block any future spans.
       * tooManySpansInTrace: Trace submitted over 100k spans at the first ingest stage
 
       ``sf.org.apm.numSpansDroppedBlocked`` has the following dimensions and data resolution:
->>>>>>> main
 
       * Dimension(s): `orgId`
       * Data resolution: 1 second
@@ -151,16 +147,12 @@ sf.org.apm.numSpansDroppedBlocked:
 sf.org.apm.numSpansDroppedBlockedByToken:
   brief: The number of spans for a specific token that APM was unable to process or has dropped due to a blocked trace or too many spans in the trace 
   description: |
-<<<<<<< HEAD
-    The number of spans for a specific token that APM was unable to process or has dropped because the trace has a blocked trace ID or too many spans in the trace.
-=======
     The number of spans for a specific token that APM was unable to process or has dropped. A span can be
     dropped for the following reasons: 
       * blockedTraceID: If any ingest endpoint reaches the 100k limit for spans in a given trace, then the trace is added to the list of blocked traces so that all the ingest endpoints block any future spans.
       * tooManySpansInTrace: Trace submitted over 100k spans at the first ingest stage
 
       ``sf.org.apm.numSpansDroppedBlocked`` has the following dimensions and data resolution:
->>>>>>> main
 
       * Dimension(s): `orgId`
       * Data resolution: 1 second