Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r23ff586bf450a0fe6dd88bdac1fb433cfeb7e6e8 -rf5f9b7f7aebb2b985d61641713635bc422c29bc9
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 23ff586bf450a0fe6dd88bdac1fb433cfeb7e6e8)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f5f9b7f7aebb2b985d61641713635bc422c29bc9)
@@ -959,6 +959,7 @@
 // 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 );
 
@@ -975,6 +976,11 @@
 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 );
 
 /**@}*/