diff --git a/docs/software/python/cli.md b/docs/software/python/cli.md
index ea4de653..2cf9c9f5 100644
--- a/docs/software/python/cli.md
+++ b/docs/software/python/cli.md
@@ -399,7 +399,6 @@ To create to a file with the connected device's configuration, this command's ou
 
 **Usage**
 
-<<<<<<< HEAD
 ```shell
 meshtastic --export-config > example_config.yaml
 ```
@@ -407,19 +406,9 @@ meshtastic --export-config > example_config.yaml
 **Usage**
 
 ```shell
-=======
-``` shell
->>>>>>> d5d2fdf (File usage)
 meshtastic --export-config
 ```
 
-**Usage - file output**
-
-``` shell
-meshtastic --export-config > example_config.yaml
-```
-
-
 ### --support
 
 Print out info that would be helpful supporting any issues.
@@ -442,4 +431,4 @@ Deprecated - use "--set is_router true" instead.
 
 ### --unset-router
 
-Deprecated - use "--set is_router false" instead.
+Deprecated - use "--set is_router false" instead.
\ No newline at end of file