Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rfbc0a281b094ff309dcbf83db1878818a9b384f1 -rf7292cd3376119210980f14e8bdb0ec5e0cf5df5
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision fbc0a281b094ff309dcbf83db1878818a9b384f1)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f7292cd3376119210980f14e8bdb0ec5e0cf5df5)
@@ -1058,12 +1058,21 @@
 
             case MSG_ID_START_STOP_PRIMARY_HEATER:
                 handleStartStopPrimaryHeater ( message );
+<<<<<<< HEAD
                 break;
 
             case MSG_ID_LOAD_CELL_OVERRIDE:
                 handleTestLoadCellOverrideRequest( message );
                 break;
 
+=======
+                break;
+
+            case MSG_ID_LOAD_CELL_OVERRIDE:
+                handleTestLoadCellOverrideRequest( message );
+                break;
+
+>>>>>>> DEN-5864-dg-ro-pump-2-of-2
             case MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE:
                 handleTestLoadCellDataBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1084,6 +1093,10 @@
                 handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
 
+            case MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE:
+                handleTestDrainPumpRPMOverrideRequest( message );
+                break;
+
             case MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestDrainPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1136,6 +1149,10 @@
                 handleSetAccelCalibration( message );
                 break;
 
+            case MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE:
+                handleSetDrainPumpDeltaPressureOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_SOFTWARE_RESET_REQUEST:
                 handleDGSoftwareResetRequest( message );
                 break;
@@ -1156,6 +1173,17 @@
                 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 );
+
             case MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE:
                 handleTestROPumpDutyCycleOverride( message );
                 break;