Resolve conflicts: keep MQTT/WiFi/timezone/analyzer defaults and get handlers, add upstream neighbour sort guard, adc_multiplier and pending_discover, and bootloader.ver get handler. Co-authored-by: Cursor <cursoragent@cursor.com>
Resolve conflicts: keep MQTT/WiFi/timezone/analyzer defaults and get handlers, add upstream neighbour sort guard, adc_multiplier and pending_discover, and bootloader.ver get handler. Co-authored-by: Cursor <cursoragent@cursor.com>