Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5fee19014b35574d67b210f71581a6013650528e -r199502232e53e78651a65c4cfbfcee27379d4f56
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5fee19014b35574d67b210f71581a6013650528e)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 199502232e53e78651a65c4cfbfcee27379d4f56)
@@ -8013,7 +8013,6 @@
 
 /*********************************************************************//**
  * @brief
-<<<<<<< HEAD
  * The handleDialInPumpHardStopRequest function handles a
  * request to stop the dial in pump.
  * @details Inputs: none
@@ -8083,54 +8082,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetBootloaderRequest function handles a
- * request to set the flag to trigger update mode
- * after a reboot.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleSetBootloaderRequest( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // For now, there's no flag to set to stay in bootloader,
-    // this might change in the future, so leave message.
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
- * The handleEnterBootloaderNowRequest function handles a
- * request immediately jump to the bootloader application.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleEnterBootloaderNowRequest( MESSAGE_T *message )
-{
-    BOOL result = (0 == message->hdr.payloadLen);
-
-    // respond to request immediately with whether it was formatted correctly
-    sendTestAckResponseMsg((MSG_ID_T)message->hdr.msgID, result);
-
-    if (result)
-    {
-        // Jump to the bootloader, there is no coming back from this.
-        startBootloader();
-    }
-}
-
-/*********************************************************************//**
- * @brief
- * The handleEnterBootloaderNowRequest function handles a
-=======
  * The handleRebootNowRequest function handles a
->>>>>>> Update messaging and project
  * request to reboot the system. A software reset will cause the bootloader
  * to stay active.
  * @details Inputs: none
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 );
 
 /**@}*/