diff --git a/config/config.example.toml b/config/config.example.toml
index db8045d..106279f 100644
--- a/config/config.example.toml
+++ b/config/config.example.toml
@@ -90,4 +90,3 @@ temperature = 0.0                           # Controls randomness for vision mod
 #cpu_limit = 2.0
 #timeout = 300
 #network_enabled = true
->>>>>>>>> Temporary merge branch 2