Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rbe027f8c9bee75f07267f7a9ab5635bbb02df86e -r9e114bbc273088bff2739e8ea54d3af66b6cd141
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision be027f8c9bee75f07267f7a9ab5635bbb02df86e)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9e114bbc273088bff2739e8ea54d3af66b6cd141)
@@ -479,25 +479,25 @@
 BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC )
 {
     BOOL result;
-        MESSAGE_T msg;
-        U08 *payloadPtr = msg.payload;
-        HEATERS_DATA_T payload;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+    HEATERS_DATA_T payload;
 
-        // create a message record
-        blankMessage( &msg );
-        msg.hdr.msgID = MSG_ID_DG_HEATERS_DATA;
-        msg.hdr.payloadLen = sizeof( HEATERS_DATA_T );
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_HEATERS_DATA;
+    msg.hdr.payloadLen = sizeof( HEATERS_DATA_T );
 
-        payload.mainPrimayHeaterDC = mainPrimaryDC;
-        payload.smallPrimaryHeaterDC = smallPrimaryDC;
-        payload.trimmerHeaterDC = trimmerDC;
+    payload.mainPrimayHeaterDC = mainPrimaryDC;
+    payload.smallPrimaryHeaterDC = smallPrimaryDC;
+    payload.trimmerHeaterDC = trimmerDC;
 
-        memcpy( payloadPtr, &payload, sizeof( HEATERS_DATA_T ) );
+    memcpy( payloadPtr, &payload, sizeof( HEATERS_DATA_T ) );
 
-        // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-        result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
+    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
 
-        return result;
+    return result;
 }
 
 /*************************************************************************
@@ -910,6 +910,61 @@
 }
 
 /*************************************************************************
+ * @brief handleSetRTCTimestamp
+ * The handleSetRTCTimestamp function handles a request to write time and
+ * date to RTC
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetRTCTimestamp( MESSAGE_T *message )
+{
+    BOOL result;
+    U08 seconds = message->payload[0];
+    U08 minutes = message->payload[1];
+    U08 hours   = message->payload[2];
+    U08 days    = message->payload[3];
+    U08 months  = message->payload[4];
+    U32 years;
+    memcpy(&years, &message->payload[5], sizeof(U32));
+
+    result = setRTCTimestamp( seconds, minutes, hours, days, months, years );
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*************************************************************************
+ * @brief
+ * The handleStartStopPrimaryHeater function handles a request start or
+ * stop the primary heater
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return result
+ *************************************************************************/
+BOOL handleStartStopPrimaryHeater( MESSAGE_T * message )
+{
+    BOOL result;
+    U32 heaterStatus = message->payload[0];
+
+    if ( heaterStatus == 1 )
+    {
+        result = startPrimaryHeater();
+    }
+    else
+    {
+        stopPrimaryHeater();
+        result = TRUE;
+    }
+
+    return result;
+}
+
+/*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
@@ -1031,8 +1086,6 @@
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride )
 
 /*************************************************************************
-<<<<<<< HEAD
-=======
  * @brief
  * The handleTestLoadCellOverrideRequest function handles a request to \n
  * override the value read from the given load cell.
@@ -1084,33 +1137,6 @@
                                 testSetHeatersPublishIntervalOverride, testResetHeatersPublishIntervalOverride )
 
 /*************************************************************************
- * @brief handleSetRTCTimestamp
- * The handleSetRTCTimestamp function handles a request to write time and
- * date to RTC
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleSetRTCTimestamp( MESSAGE_T *message )
-{
-    BOOL result;
-    U08 seconds = message->payload[0];
-    U08 minutes = message->payload[1];
-    U08 hours   = message->payload[2];
-    U08 days    = message->payload[3];
-    U08 months  = message->payload[4];
-    U32 years;
-    memcpy(&years, &message->payload[5], sizeof(U32));
-
-    result = setRTCTimestamp( seconds, minutes, hours, days, months, years );
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*************************************************************************
  * @brief
  * The handleTestLoadCellDataBroadcastIntervalOverrideRequest function handles \n
  * a request to override the broadcast interval for load cell data.
@@ -1267,31 +1293,3 @@
 }
 
 #endif
-
-/*************************************************************************
- * @brief
- * The handleStartStopPrimaryHeater function handles a request start or
- * stop the primary heater
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
- * @return result
- *************************************************************************/
-BOOL handleStartStopPrimaryHeater( MESSAGE_T * message )
-{
-    BOOL result;
-    U32 heaterStatus = message->payload[0];
-
-    if ( heaterStatus == 1 )
-    {
-        result = startPrimaryHeater();
-    }
-    else
-    {
-        stopPrimaryHeater();
-        result = TRUE;
-    }
-
-    return result;
-}