From d6fcabcb4c5f255026a57b7f06cdec74a880d349 Mon Sep 17 00:00:00 2001
From: Jared Dohrman <jared@dohrman.me>
Date: Fri, 26 Jun 2026 12:45:28 +1000
Subject: [PATCH] fix(mqtt-bridge): resolve release-notes conflict and clean up
 review nits

- Resolve leftover merge conflict markers in release-notes.yml from PR #73,
  keeping both the observer-eastmesh-bridge-espnow 2026.6.5 and the new
  observer-eastmesh-bridge-mqtt 2026.7.0 entries in track order
- Normalize the bridge-mqtt release entry `area:` values to the file's
  conventions (bridge -> mqtt, boards -> board)
- Remove dead bridge_peer_port > 65535 check in loadPrefsInt (uint16_t can
  never exceed 65535; the 0 -> 1883 default is handled at use)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 release-notes.yml         | 49 +++++++++++++++++++--------------------
 src/helpers/CommonCLI.cpp |  3 ---
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/release-notes.yml b/release-notes.yml
index 8824f3ed..229145d6 100644
--- a/release-notes.yml
+++ b/release-notes.yml
@@ -419,30 +419,6 @@ releases:
       - "`get mqtt.status` output changed from per-broker fields to `p:`/`s:` broker slots; anything parsing the previous format must be updated."
       - "Saved LetsMesh EU/US broker selections are cleared once on upgrade; re-enable a broker such as MeshMapper if a second uplink is required."
 
-<<<<<<< HEAD
-  - track: observer-eastmesh-bridge-mqtt
-    version: "2026.7.0"
-    tag: "observer-eastmesh-bridge-mqtt-v2026.7.0"
-    date: "2026-06-24"
-    previous_version: null
-    summary: "Introduces the observer-eastmesh-bridge-mqtt release track with bidirectional MQTT mesh bridging and web-panel peer broker configuration."
-    changes:
-      - type: added
-        area: bridge
-        text: "Added `WITH_MQTT_BRIDGE` and `MQTTBridge` for bidirectional mesh packet transport over a shared MQTT topic at a peer broker."
-      - type: added
-        area: cli
-        text: "Added `get/set bridge.peer.host` and `get/set bridge.peer.port` for configuring the peer MQTT broker used by the mesh bridge."
-      - type: added
-        area: web
-        text: "Added mesh bridge peer MQTT host:port controls to the web panel on MQTT bridge builds."
-      - type: added
-        area: release
-        text: "Added the `observer-eastmesh-bridge-mqtt-v*` release tag format, PlatformIO `*_repeater_observer_mqtt_bridge` environments, and CI build workflow."
-      - type: added
-        area: boards
-        text: "Added `Xiao_S3_WIO_repeater_observer_mqtt_bridge` as the first supported observer MQTT bridge target."
-=======
   - track: observer-eastmesh-bridge-espnow
     version: "2026.6.5"
     tag: "observer-eastmesh-bridge-espnow-v2026.6.5"
@@ -465,5 +441,28 @@ releases:
       - type: docs
         area: docs
         text: "Documented the Waev broker in the README and custom CLI guides."
->>>>>>> cdf2cc6fa283615a04c488ca3ad324a33b72966d
+    breaking_changes: []
+
+  - track: observer-eastmesh-bridge-mqtt
+    version: "2026.7.0"
+    tag: "observer-eastmesh-bridge-mqtt-v2026.7.0"
+    date: "2026-06-24"
+    previous_version: null
+    summary: "Introduces the observer-eastmesh-bridge-mqtt release track with bidirectional MQTT mesh bridging and web-panel peer broker configuration."
+    changes:
+      - type: added
+        area: mqtt
+        text: "Added `WITH_MQTT_BRIDGE` and `MQTTBridge` for bidirectional mesh packet transport over a shared MQTT topic at a peer broker."
+      - type: added
+        area: cli
+        text: "Added `get/set bridge.peer.host` and `get/set bridge.peer.port` for configuring the peer MQTT broker used by the mesh bridge."
+      - type: added
+        area: web
+        text: "Added mesh bridge peer MQTT host:port controls to the web panel on MQTT bridge builds."
+      - type: added
+        area: release
+        text: "Added the `observer-eastmesh-bridge-mqtt-v*` release tag format, PlatformIO `*_repeater_observer_mqtt_bridge` environments, and CI build workflow."
+      - type: added
+        area: board
+        text: "Added `Xiao_S3_WIO_repeater_observer_mqtt_bridge` as the first supported observer MQTT bridge target."
     breaking_changes: []
diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp
index f2eedcf1..91c0ebf0 100644
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -137,9 +137,6 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
     _prefs->bridge_pkt_src = constrain(_prefs->bridge_pkt_src, 0, 1);
     _prefs->bridge_baud = constrain(_prefs->bridge_baud, 9600, BRIDGE_MAX_BAUD);
     _prefs->bridge_channel = constrain(_prefs->bridge_channel, 0, 14);
-    if (_prefs->bridge_peer_port > 65535) {
-      _prefs->bridge_peer_port = 1883;
-    }
 
     _prefs->powersaving_enabled = constrain(_prefs->powersaving_enabled, 0, 1);