Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rc6d4cd2dbaac8a68be80b047f8fb0a33133576af -rf7292cd3376119210980f14e8bdb0ec5e0cf5df5
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c6d4cd2dbaac8a68be80b047f8fb0a33133576af)
+++ 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;
@@ -1174,8 +1183,23 @@
 
             case MSG_ID_DG_FANS_DATA_PUBLISH_INTERVAL_OVERRIDE:
                 handleTestFansDataPublishIntervalOverride( message );
+
+            case MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE:
+                handleTestROPumpDutyCycleOverride( message );
                 break;
 
+            case MSG_ID_DG_RO_FLOW_RATE_OVERRIDE:
+                handleTestMeasuredROFlowRateOverride( message );
+                break;
+
+            case MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE:
+                handleTestROPumpTargetFlowOverride( message );
+                break;
+
+            case MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE:
+                handleROPumpTargetPressureOverride( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;