Index: Common.h
===================================================================
diff -u -r17fdefc3752a193c0d2d495f1497cc8c1e35c406 -r7c7b161bc90bef9ae5c7dbf9ee1ab36000d6f12b
--- Common.h	(.../Common.h)	(revision 17fdefc3752a193c0d2d495f1497cc8c1e35c406)
+++ Common.h	(.../Common.h)	(revision 7c7b161bc90bef9ae5c7dbf9ee1ab36000d6f12b)
@@ -7,8 +7,8 @@
 *
 * @file    Common.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      18-Oct-2021
+* @author  (last)      Sean Nash
+* @date    (last)      12-Nov-2021
 *
 * @author  (original)  Sean
 * @date    (original)  04-Feb-2020
@@ -177,7 +177,6 @@
     activateAlarm2Data( a, dat1, dat2 ); \
 }
 
-#pragma pack(push,1)
 /// Record structure for unsigned integer event data.
 typedef struct
 {
@@ -228,7 +227,10 @@
     EVENT_DATA_TYPES_T  dataType;   ///< The type of event data provided.
     EVENT_DATAS_T       data;       ///< The event data of specified type.
 } EVENT_DATA_T;
+<<<<<<< HEAD
 #pragma pack(pop)
+=======
+>>>>>>> DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2
 
 /// Macro to set a specific alarm with 2 pieces of unsigned 32-bit alarm data.
 #define SEND_EVENT_WITH_2_U32_DATA(e,d1,d2)   { \
Index: MessageSupport.c
===================================================================
diff -u -r1d4945e7608e24b685f54368d0791455ef2f48be -r7c7b161bc90bef9ae5c7dbf9ee1ab36000d6f12b
--- MessageSupport.c	(.../MessageSupport.c)	(revision 1d4945e7608e24b685f54368d0791455ef2f48be)
+++ MessageSupport.c	(.../MessageSupport.c)	(revision 7c7b161bc90bef9ae5c7dbf9ee1ab36000d6f12b)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+#include "MessageSupport.h"
 #include "SystemCommMessages.h"
 #include "Utilities.h"
 
Index: NVDataMgmt.c
===================================================================
diff -u -r1d4945e7608e24b685f54368d0791455ef2f48be -r7c7b161bc90bef9ae5c7dbf9ee1ab36000d6f12b
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 1d4945e7608e24b685f54368d0791455ef2f48be)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 7c7b161bc90bef9ae5c7dbf9ee1ab36000d6f12b)
@@ -2280,7 +2280,7 @@
                 writtenRecordStatus = NVDATAMGMT_RECORD_NOT_CHECKED;
 
                 // Issue the write command
-                Fapi_issueProgrammingCommand( (U32*)memoryPtr, structPtr, jobSpecs.maxWriteBufferSize, 0x00, 0, Fapi_DataOnly );
+                Fapi_issueProgrammingCommand ( (U32*)memoryPtr, structPtr, jobSpecs.maxWriteBufferSize, 0x00, 0, Fapi_DataOnly );
             }
         }
     }