Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rff5d79f69db29d73a440d0ca8e6854b5837205d3 -r29b362c485f28f45ef367342ac895e1c1907ac45
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ff5d79f69db29d73a440d0ca8e6854b5837205d3)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 29b362c485f28f45ef367342ac895e1c1907ac45)
@@ -40,12 +40,7 @@
 #include "TreatmentStop.h"
 #include "Utilities.h"
 #include "WatchdogMgmt.h"
-<<<<<<< HEAD
 
-=======
-#include "HDDefs.h"
-
->>>>>>> ad5e8205... Logging of various things
 /**
  *  @addtogroup SystemCommMessages
  *  @{
@@ -2642,7 +2637,6 @@
 
 
 
-<<<<<<< HEAD
 /*********************************************************************//**
  * @brief
  * The handleChangeUFSettingsRequest function handles a ultrafiltration
@@ -2745,111 +2739,6 @@
     {
         sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
     }
-=======
-/*********************************************************************//**
- * @brief
- * The handleChangeUFSettingsRequest function handles a ultrafiltration
- * change settings request message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleChangeUFSettingsRequest( MESSAGE_T *message )
-{
-    if ( message->hdr.payloadLen == sizeof(F32) )
-    {
-        F32 uFVolume;
-
-        memcpy( &uFVolume, message->payload, sizeof(F32) );
-
-        verifyUFSettingsChange( uFVolume );
-    }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
-}
-
-/*********************************************************************//**
- * @brief
- * The handleChangeUFSettingsConfirmation function handles a ultrafiltration
- * change setting confirmation message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleChangeUFSettingsConfirmation( MESSAGE_T *message )
-{
-    if ( message->hdr.payloadLen == sizeof(UF_SETTINGS_CHANGE_CONFIRMATION_PAYLOAD_T) )
-    {
-        UF_SETTINGS_CHANGE_CONFIRMATION_PAYLOAD_T payload;
-
-        memcpy( &payload, message->payload, sizeof(UF_SETTINGS_CHANGE_CONFIRMATION_PAYLOAD_T) );
-
-        verifyUFSettingsConfirmation( payload.volume_mL, payload.adjustType );
-    }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
-}
-
-/*********************************************************************//**
- * @brief
- * The handleChangeTreatmentDurationRequest function handles a treatment
- * duration setting change message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleChangeTreatmentDurationRequest( MESSAGE_T *message )
-{
-    if ( message->hdr.payloadLen == sizeof(U32) )
-    {
-        U32 timeInMin;
-
-        memcpy( &timeInMin, message->payload, sizeof(U32) );
-
-        verifyTreatmentDurationSettingChange( timeInMin );
-
-    }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
-}
-
-/*********************************************************************//**
- * @brief
- * The handleChangeBloodDialysateRateChangeRequest function handles a blood
- * and dialysate rate settings change message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleChangeBloodDialysateRateChangeRequest( MESSAGE_T *message )
-{
-    U32  expPayloadSize = sizeof(U32) + sizeof(U32);
-
-    if ( expPayloadSize == message->hdr.payloadLen )
-    {
-        U32 bloodRate;
-        U32 dialRate;
-
-        memcpy( &bloodRate, &message->payload[0], sizeof(U32) );
-        memcpy( &dialRate, &message->payload[sizeof(U32)], sizeof(U32) );
-
-        verifyBloodAndDialysateRateSettingsChange( bloodRate, dialRate );
-    }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
->>>>>>> ad5e8205... Logging of various things
 }
 
 /*********************************************************************//**
@@ -2929,71 +2818,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUIChangedScreenBrightness function handles a screen brightness change
- *  message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleUIChangedScreenBrightness( MESSAGE_T *message )
-{
-    if ( sizeof( U32 ) == message->hdr.payloadLen )
-    {
-        U32 payload;
-
-        memcpy( &payload, &message->payload[0], sizeof( U32 ) );
-        sendTreatmentLogEventData( SCREEN_BRIGHTNESS_CHANGED_EVENT, (F32)0.0, (F32)payload );
-    }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
-}
-
-/*********************************************************************//**
- * @brief
- * The handleDGSwitchChanged function handles a DG switch change
- *  message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleDGSwitchChanged( MESSAGE_T *message )
-{
-    U32  expPayloadSize = sizeof(U32) + sizeof(U32);
-
-        if ( expPayloadSize == message->hdr.payloadLen )
-        {
-            U32 switchId;
-            U32 newstate;
-            U32 oldstate = (U32)0;
-
-            memcpy( &switchId, &message->payload[0], sizeof(U32) );
-            memcpy( &newstate, &message->payload[sizeof(U32)], sizeof(U32) );
-
-            if ((U32)0 == newstate)
-            {
-                oldstate = 1;
-            }
-            if ((U32)0 == switchId)
-            {
-                sendTreatmentLogEventData( CONCENTRATE_CAP_SWITCH_CHANGED_EVENT, (F32)oldstate, (F32)newstate );
-            }
-            if ((U32)1 == switchId)
-            {
-                sendTreatmentLogEventData( DIALYSATE_CAP_SWITCH_CHANGED_EVENT, (F32)oldstate, (F32)newstate );
-            }
-        }
-        else
-        {
-            sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-        }
-}
-
-/*********************************************************************//**
- * @brief
  * The handleSalineBolusRequest function handles a saline bolus request
  * message from the UI.
  * @details Inputs: none