Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -re4b79bd0d31e779619a787f9ce4352d0fd3d4dce -r666d17245e2873e847cdf0b1da07abfe0702523e
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e4b79bd0d31e779619a787f9ce4352d0fd3d4dce)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 666d17245e2873e847cdf0b1da07abfe0702523e)
@@ -1058,6 +1058,7 @@
 
             case MSG_ID_START_STOP_PRIMARY_HEATER:
                 handleStartStopPrimaryHeater ( message );
+<<<<<<< HEAD
                 break;
 
             case MSG_ID_LOAD_CELL_OVERRIDE:
@@ -1086,8 +1087,37 @@
 
             case MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE:
                 handleTestDrainPumpRPMOverrideRequest( message );
+=======
                 break;
 
+            case MSG_ID_LOAD_CELL_OVERRIDE:
+                handleTestLoadCellOverrideRequest( message );
+                break;
+
+            case MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE:
+                handleTestLoadCellDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_PRESSURE_OVERRIDE:
+                handleTestPressureSensorOverrideRequest( message );
+                break;
+
+            case MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
+                handleTestPressureDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
+                handleTestROMeasuredFlowOverrideRequest( message );
+                break;
+
+            case MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
+                handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE:
+                handleTestDrainPumpSetPointOverrideRequest( message );
+                break;
+
             case MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestDrainPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1164,6 +1194,18 @@
                 handleConcentratePumpPublishIntervalOverride( message );
                 break;
 
+            case MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestThermistorsDataPublishIntervalOverride( message );
+                break;
+
+            case MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE:
+                handleTestThermistorsValueOverride( message );
+                break;
+
+            case MSG_ID_DG_FANS_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestFansDataPublishIntervalOverride( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;