diff --git a/src/helpers/bridges/MQTTBridge.cpp b/src/helpers/bridges/MQTTBridge.cpp
index 11c61981..a6c1b3ea 100644
--- a/src/helpers/bridges/MQTTBridge.cpp
+++ b/src/helpers/bridges/MQTTBridge.cpp
@@ -1333,11 +1333,6 @@ void MQTTBridge::publishStatusToAnalyzerClient(PsychicMqttClient* client, const
 }
 
 void MQTTBridge::maintainAnalyzerConnections() {
-<<<<<<< HEAD
-  // PsychicMqttClient handles connection maintenance and reconnection automatically
-  // No manual maintenance needed - the library manages this internally
-  // Connection state changes are handled via the onConnect/onDisconnect callbacks
-=======
   if (!_identity) {
     return;
   }