Index: MessagePayloads.h
===================================================================
diff -u -rdabcbbacae0c921b9628e148c2028e9465a76024 -ra64a164f5288c85c56759b212fc32b459f6cbca0
--- MessagePayloads.h	(.../MessagePayloads.h)	(revision dabcbbacae0c921b9628e148c2028e9465a76024)
+++ MessagePayloads.h	(.../MessagePayloads.h)	(revision a64a164f5288c85c56759b212fc32b459f6cbca0)
@@ -110,8 +110,6 @@
     BOOL isPressureStabilizedDuringFill;                                ///< Whether pressure stabilized during fill or not
     BOOL balChamberSWOnlyState;                                         ///< Balancing chamber switching only status ( On/Off)
     BOOL isBalChamberSwitchingActive;                                   ///< Balancing chamber switching status
-<<<<<<< HEAD
-=======
 #ifdef __BAL_CHAMBER_DEBUG__
     U32 detectTolCount;
     U32 maxDetectCount;
@@ -124,7 +122,6 @@
     F32 lastPrevSpentDialPressure;
     F32 prevSpentDialPressure;
 #endif
->>>>>>> LDT-5409-dd-balancing-chamber-stops-duri
 } BAL_CHAMBER_DATA_T;
 
 /// Chamber H vent open request data