diff --git a/src/helpers/bridges/MQTTBridge.cpp b/src/helpers/bridges/MQTTBridge.cpp
index 829db8a8..16a32def 100644
--- a/src/helpers/bridges/MQTTBridge.cpp
+++ b/src/helpers/bridges/MQTTBridge.cpp
@@ -595,6 +595,7 @@ void MQTTBridge::publishPacket(mesh::Packet* packet, bool is_tx,
                                 float snr, float rssi) {
   if (!packet) return;
   
+<<<<<<< HEAD
   // Size-adaptive buffer: estimate needed size based on packet size
   // Most packets are <100 bytes (need ~400 byte JSON), large packets need ~1500 bytes
   int packet_size = packet->getRawLength();