diff --git a/docs/settings/modules/telemetry-module.mdx b/docs/settings/modules/telemetry-module.mdx
index a50abcae..2b9550e9 100644
--- a/docs/settings/modules/telemetry-module.mdx
+++ b/docs/settings/modules/telemetry-module.mdx
@@ -109,22 +109,12 @@ values={[
 ]}>
 <TabItem value="cli">
 
-<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
-
-```shell title="Display Farenheit"
-meshtastic --set telemetry_module_display_farenheit true
-```
-
-````shell title="Display Celsius"
-meshtastic --set telemetry_module_display_farenheit false
-=======
 ```shell title="Display Farenheit"
 meshtastic --set telemetry_module_environment_display_fahrenheit true
 ````
 
 ```shell title="Display Celsius"
 meshtastic --set telemetry_module_environment_display_fahrenheit false
->>>>>>> master:docs/settings/telemetry-module.md
 ```
 
   </TabItem>
@@ -168,22 +158,12 @@ values={[
 ]}>
 <TabItem value="cli">
 
-<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
-
-```shell title="Enable Module"
-meshtastic --set telemetry_module_measurement_enabled true
-```
-
-````shell title="Disable Module"
-meshtastic --set telemetry_module_measurement_enabled false
-=======
 ```shell title="Enable Module"
 meshtastic --set telemetry_module_environment_measurement_enabled true
 ````
 
 ```shell title="Disable Module"
 meshtastic --set telemetry_module_environment_measurement_enabled false
->>>>>>> master:docs/settings/telemetry-module.md
 ```
 
   </TabItem>
@@ -227,14 +207,8 @@ values={[
 ]}>
 <TabItem value="cli">
 
-<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
-
-````shell title="Configure telemetry_module_read_error_count_threshold to 3 tries"
-meshtastic --set telemetry_module_read_error_count_threshold 3
-=======
 ```shell title="Configure telemetry_module_environment_read_error_count_threshold to 3 tries"
 meshtastic --set telemetry_module_environment_read_error_count_threshold 3
->>>>>>> master:docs/settings/telemetry-module.md
 ````
 
   </TabItem>
@@ -278,14 +252,8 @@ values={[
 ]}>
 <TabItem value="cli">
 
-<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
-
-````shell title="Configure telemetry_module_recovery_interval to 120 seconds"
-meshtastic --set telemetry_module_recovery_interval 120
-=======
 ```shell title="Configure telemetry_module_environment_recovery_interval to 120 seconds"
 meshtastic --set telemetry_module_environment_recovery_interval 120
->>>>>>> master:docs/settings/telemetry-module.md
 ````
 
   </TabItem>
@@ -329,22 +297,12 @@ values={[
 ]}>
 <TabItem value="cli">
 
-<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
-
-```shell title="Enable on device screen"
-meshtastic --set telemetry_module_screen_enabled true
-```
-
-````shell title="Disable on device screen"
-meshtastic --set telemetry_module_screen_enabled false
-=======
 ```shell title="Enable on device screen"
 meshtastic --set telemetry_module_environment_screen_enabled true
 ````
 
 ```shell title="Disable on device screen"
 meshtastic --set telemetry_module_environment_screen_enabled false
->>>>>>> master:docs/settings/telemetry-module.md
 ```
 
   </TabItem>
@@ -396,14 +354,8 @@ values={[
 ]}>
 <TabItem value="cli">
 
-<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
-
-````shell title="Set module sensor pin"
-meshtastic --set telemetry_module_sensor_pin PINNUMBER
-=======
 ```shell title="Set module sensor pin"
 meshtastic --set telemetry_module_environment_sensor_pin PINNUMBER
->>>>>>> master:docs/settings/telemetry-module.md
 ````
 
   </TabItem>
@@ -470,22 +422,12 @@ values={[
 The CLI is able to take the `value` or the `name` of the sensor from the table above.
 :::
 
-<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
-
-```shell title="Set sensor type to DS18B20"
-meshtastic --set telemetry_module_sensor_type 1
-```
-
-````shell title="Set sensor type to DS18B20"
-meshtastic --set telemetry_module_sensor_type DS18B20
-=======
 ```shell title="Set sensor type to DS18B20"
 meshtastic --set telemetry_module_environment_sensor_type 2
 ````
 
 ```shell title="Set sensor type to DS18B20"
 meshtastic --set telemetry_module_environment_sensor_type DS18B20
->>>>>>> master:docs/settings/telemetry-module.md
 ```
 
   </TabItem>
@@ -525,14 +467,8 @@ values={[
 ]}>
 <TabItem value="cli">
 
-<<<<<<< HEAD:docs/settings/environmental-measurment-module.mdx
-
-````shell title="Set module update interval to 15 seconds"
-meshtastic --set telemetry_module_update_interval 15
-=======
 ```shell title="Set module update interval to 120 seconds"
 meshtastic --set telemetry_module_environment_update_interval 120
->>>>>>> master:docs/settings/telemetry-module.md
 ````
 
   </TabItem>