docs: minor docs fix

docs/sources/features/panels/singlestat.md

@@ -64,7 +64,6 @@ Sparklines are a great way of seeing the historical data related to the summary
 
 > ***Pro-tip:*** Reduce the opacity on  fill colors for nice looking panels.
 
-<<<<<<< HEAD
 ### Gauge
 
 Gauges gives a clear picture of how high a value is in it's context. It's a great way to see if a value is close to the thresholds. The gauge uses the colors set in the color options.
@@ -78,39 +77,13 @@ Gauges gives a clear picture of how high a value is in it's context. It's a grea
 
 <div class="clearfix"></div>
 
-||||||| merged common ancestors
-=======
-### Gauge
-
-Gauges gives a clear picture of how high a value is in it's context. It's a great way to see if a value is close to the thresholds. The gauge uses the colors set in the color options.
-
-{{< docs-imagebox img="/img/docs/v45/singlestat-gauge-options.png" max-width="500px" class="docs-image--right docs-image--no-shadow">}}
-
-1. `Show`: The show checkbox will toggle wether the gauge is shown in the panel. When unselected, only the Singlestat value will appear.
-2. `Min/Max`: This sets the start and end point for the gauge.
-3. `Threshold Labels`: Check if you want to show the threshold labels. Thresholds are set in the color options.
-4. `Threshold Markers`: Check if you want to have a second meter showing the thresholds.
-
->>>>>>> 0a65100eaf64cd57b38110001bf614630821610c
 ### Value to text mapping
 
-<<<<<<< HEAD
 {{< docs-imagebox img="/img/docs/v45/singlestat-value-mapping.png" class="docs-image--right docs-image--no-shadow">}}
 
 Value to text mapping allows you to translate the value of the summary stat into explicit text. The text will respect all styling, thresholds and customization defined for the value. This can be useful to translate the number of the main Singlestat value into a context-specific human-readable word or message.
-||||||| merged common ancestors
-Value to text mapping allows you to translate the value of the summary stat into explicit text. The text will respect all styling, thresholds and customization defined for the value. This can be useful to translate the number of the main Singlestat value into a context-specific human-readable word or message.
-=======
-{{< docs-imagebox img="/img/docs/v45/singlestat-value-mapping.png" class="docs-image--right docs-image--no-shadow">}}
->>>>>>> 0a65100eaf64cd57b38110001bf614630821610c
 
-<<<<<<< HEAD
 <div class="clearfix"></div>
-||||||| merged common ancestors
-<img class="no-shadow" src="/img/docs/v1/Singlestat-ValueMapping.png">
-=======
-Value to text mapping allows you to translate the value of the summary stat into explicit text. The text will respect all styling, thresholds and customization defined for the value. This can be useful to translate the number of the main Singlestat value into a context-specific human-readable word or message.
->>>>>>> 0a65100eaf64cd57b38110001bf614630821610c
 
 ## Troubleshooting