Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rf5f9b7f7aebb2b985d61641713635bc422c29bc9 -r23fc8bbbb3fad7f919f491964c00cdd9064d6353
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f5f9b7f7aebb2b985d61641713635bc422c29bc9)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 23fc8bbbb3fad7f919f491964c00cdd9064d6353)
@@ -959,7 +959,6 @@
 // MSG_ID_HD_BATTERY_COMM_STATUS_OVERRIDE
 void handleBatteryI2CStatusOverrideRequest( MESSAGE_T *message );
 
-<<<<<<< HEAD
 // MSG_ID_HD_DIAL_IN_PUMP_HARD_STOP
 void handleDialInPumpHardStopRequest( MESSAGE_T * message );
 
@@ -969,18 +968,9 @@
 // MSG_ID_HD_BLOOD_PUMP_HARD_STOP
 void handleBloodPumpHardStopRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_SET_ENTER_BOOTLOADER
-void handleSetBootloaderRequest( MESSAGE_T *message );
-
-// MSG_ID_HD_ENTER_BOOTLOADER_NOW
-void handleEnterBootloaderNowRequest( MESSAGE_T *message );
-
-// MSG_ID_HD_REBOOT_NOW
-=======
 // MSG_ID_FW_SET_ENTER_BOOTLOADER
 // MSG_ID_FW_ENTER_BOOTLOADER_NOW
 // MSG_ID_FW_REBOOT_NOW
->>>>>>> Update messaging and project
 void handleRebootNowRequest( MESSAGE_T *message );
 
 /**@}*/