Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r5fee19014b35574d67b210f71581a6013650528e -r199502232e53e78651a65c4cfbfcee27379d4f56
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5fee19014b35574d67b210f71581a6013650528e)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 199502232e53e78651a65c4cfbfcee27379d4f56)
@@ -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 );
 
@@ -977,18 +976,9 @@
 // MSG_ID_HD_REBOOT_NOW
 void handleRebootNowRequest( 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 );
 
 /**@}*/