Remove conflict marker from CommonCLI.cpp

src/helpers/CommonCLI.cpp

@@ -258,7 +258,6 @@ void CommonCLI::savePrefs(FILESYSTEM* fs) {
         file.write((uint8_t *)&_prefs->mqtt_owner_public_key, sizeof(_prefs->mqtt_owner_public_key)); // 346
         file.write((uint8_t *)&_prefs->mqtt_email, sizeof(_prefs->mqtt_email)); // 347
     // 209
->>>>>>> 6f42dc3 (Implement Let's Mesh Analyzer integration in MQTT Bridge)
 =======
 >>>>>>> 3633002 (Refactor MQTT preferences handling in CommonCLI)