Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rf7292cd3376119210980f14e8bdb0ec5e0cf5df5 -r497e910ca4972a1a993cb0ae1edf30d225283b34
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f7292cd3376119210980f14e8bdb0ec5e0cf5df5)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 497e910ca4972a1a993cb0ae1edf30d225283b34)
@@ -21,6 +21,7 @@
 #include "sci.h"
 #include "sys_dma.h"
 
+#include "DrainPump.h"
 #include "SystemComm.h"
 #include "Comm.h"
 #include "Interrupts.h"
@@ -1058,21 +1059,12 @@
 
             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;