Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r72831229355e23d75b0e48dbbf134cf0b3e77001 -r5fee19014b35574d67b210f71581a6013650528e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 72831229355e23d75b0e48dbbf134cf0b3e77001)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5fee19014b35574d67b210f71581a6013650528e)
@@ -40,7 +40,6 @@
 #include "TreatmentEnd.h"
 #include "TreatmentRecirc.h"
 #include "TreatmentStop.h"
-#include "Update.h"
 #include "Utilities.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
@@ -8014,6 +8013,7 @@
 
 /*********************************************************************//**
  * @brief
+<<<<<<< HEAD
  * The handleDialInPumpHardStopRequest function handles a
  * request to stop the dial in pump.
  * @details Inputs: none
@@ -8128,8 +8128,11 @@
 /*********************************************************************//**
  * @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 for XX seconds.
+ * to stay active.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message : a pointer to the message to handle
@@ -8144,8 +8147,8 @@
 
     if (result)
     {
-        // Jump to the bootloader, there is no coming back from this.
-        rebootSystemNow();
+        // Trigger a software reset.
+        systemREG1->SYSECR = (0x2) << 14;
     }
 }