Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r666d17245e2873e847cdf0b1da07abfe0702523e -rc6d4cd2dbaac8a68be80b047f8fb0a33133576af
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 666d17245e2873e847cdf0b1da07abfe0702523e)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c6d4cd2dbaac8a68be80b047f8fb0a33133576af)
@@ -1058,7 +1058,6 @@
 
             case MSG_ID_START_STOP_PRIMARY_HEATER:
                 handleStartStopPrimaryHeater ( message );
-<<<<<<< HEAD
                 break;
 
             case MSG_ID_LOAD_CELL_OVERRIDE:
@@ -1087,37 +1086,8 @@
 
             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;