Fix additional merge issues

admin_dashboard.yaml

@@ -1006,6 +1006,13 @@ views:
                   int %} {% set roomtemp =
                   states('sensor.master_bedroom_temperature') | int %} {{
                   'Threshold Met' if roomtemp >= threshold else '' }}
+              - entity: input_number.master_bedroom_mode_switch_threshold
+                name: MBR Mode Switch
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.master_bedroom_mode_switch_threshold') |
+                  int %} {% set high = states('sensor.todays_high_temp') | int
+                  %} {{ 'Threshold Met' if high >= threshold else '' }}
               - entity: input_boolean.master_bedroom_aircon_installed
                 name: Aircon Installed
               - entity: input_boolean.master_bedroom_climate_protocol
@@ -1041,6 +1048,13 @@ views:
                   int %} {% set roomtemp =
                   states('sensor.emma_bedroom_temperature') | int %} {{
                   'Threshold Met' if roomtemp >= threshold else '' }}
+              - entity: input_number.emma_bedroom_mode_switch_threshold
+                name: EBR Mode Switch
+                secondary_info: >
+                  {% set threshold =
+                  states('input_number.emma_bedroom_mode_switch_threshold') |
+                  int %} {% set high = states('sensor.todays_high_temp') | int
+                  %} {{ 'Threshold Met' if high >= threshold else '' }}
               - entity: input_boolean.emma_bedroom_aircon_installed
                 name: Aircon Installed
               - entity: input_boolean.emma_bedroom_heater_installed