Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -rff5d79f69db29d73a440d0ca8e6854b5837205d3 -r3f2bb2c7793f68d26138308c8dc48e69d251f5a2
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision ff5d79f69db29d73a440d0ca8e6854b5837205d3)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 3f2bb2c7793f68d26138308c8dc48e69d251f5a2)
@@ -370,44 +370,6 @@
     offRequestPulseTimer = 0;
     offRequestPulseCount = OFF_REQUEST_PULSE_COUNT;
     offButtonPressPending = TRUE;
-<<<<<<< HEAD
-}
-
-/*********************************************************************//**
- * @brief
- * The handleOffButtonProcessing function checks for and processes off button
- * activity.
- * @details Inputs: offButtonState, prevOffButtonState
- * @details Outputs: offButtonPressPending, offRequestPulseCount, offRequestPulseTimer
- * @return none
- *************************************************************************/
-static void handleOffButtonProcessing( void )
-{
-    // Handle button state transitions for off button
-    if ( getOffButtonState() != prevOffButtonState )
-    {
-        if ( getOffButtonState() == BUTTON_STATE_PRESSED )
-        {
-            // If off request in a valid mode, send to UI for user confirmation
-            userConfirmOffButton( OFF_BUTTON_RSP_USER_REQUESTS_POWER_OFF );
-        }
-        prevOffButtonState = getOffButtonState();
-    }
-
-    // If off request has not been confirmed by user before it expires, cancel it
-    if ( TRUE == offRequestAwaitingUserConfirmation )
-    {
-        offRequestPendingTimer += TASK_PRIORITY_INTERVAL;
-        if ( offRequestPendingTimer >= OFF_REQUEST_EXPIRATION_TIME_MS )
-        {
-            offRequestAwaitingUserConfirmation = FALSE;
-            sendOffButtonMsgToUI( OFF_BUTTON_CMD_CANCEL_USER_CONFIRM_PROMPT );
-        }
-    }
-
-    // If user confirmed off button press, manage off request sequence
-    if ( TRUE == offButtonPressPending )
-=======
 }
 
 /*********************************************************************//**
@@ -446,7 +408,6 @@
 
     // If user confirmed off button press, manage off request sequence
     if ( TRUE == offButtonPressPending )
->>>>>>> ad5e8205... Logging of various things
     {
         // Delay power off to provide sub-systems time to prepare for shutdown
         offRequestDelayTimer += TASK_PRIORITY_INTERVAL;
@@ -464,60 +425,6 @@
                 }
                 toggleCPLDOffRequest();
             }
-<<<<<<< HEAD
-        }
-    }
-}
-
-/*********************************************************************//**
- * @brief
- * The handleStopButtonProcessing function checks for and processes stop button
- * activity.
- * @details Inputs: stopButtonState, prevStopButtonState
- * @details Outputs: stopButtonPressPending
- * @return none
- *************************************************************************/
-static void handleStopButtonProcessing( void )
-{
-    // Handle button state transitions for stop button
-    if ( getStopButtonState() != prevStopButtonState )
-    {
-        if ( getStopButtonState() == BUTTON_STATE_PRESSED )
-        {
-            stopButtonPressPending = TRUE;
-            stopButtonPendingTimer = getMSTimerCount();
-        }
-        prevStopButtonState = getStopButtonState();
-    }
-
-    // Handle when a stop button press is pending
-    if ( TRUE == stopButtonPressPending )
-    {
-        // If stop button not consumed within a reasonable time, s/w fault
-        if ( TRUE == didTimeout( stopButtonPendingTimer, STOP_BUTTON_PENDING_TIMEOUT_MS ) )
-        {
-            stopButtonPressPending = FALSE;
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_BUTTONS_STOP_BUTTON_NOT_CONSUMED )
-        }
-    }
-}
-
-
-/*************************************************************************
- *                       TEST SUPPORT FUNCTIONS
- *************************************************************************/
-
-
-/*********************************************************************//**
- * @brief
- * The testSetOffButtonStateOverride function overrides the state of then
- * off button with a given state.n
- * @details Inputs: none
- * @details Outputs: dataOffButtonState
- * @param value override state for the off button
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-=======
         }
     }
 }
@@ -572,7 +479,6 @@
  * @param value override state for the off button
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
->>>>>>> ad5e8205... Logging of various things
 BOOL testSetOffButtonStateOverride( U32 value )
 {
     BOOL result = FALSE;