Index: Common.h
===================================================================
diff -u -r7c7b161bc90bef9ae5c7dbf9ee1ab36000d6f12b -rbf2d6475e56347bca120d709c37f16d0f781f944
--- Common.h	(.../Common.h)	(revision 7c7b161bc90bef9ae5c7dbf9ee1ab36000d6f12b)
+++ Common.h	(.../Common.h)	(revision bf2d6475e56347bca120d709c37f16d0f781f944)
@@ -227,10 +227,6 @@
     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)   { \