Index: MessagePayloads.h
===================================================================
diff -u -rd01a89232711f7a014fa44fa12203595b9501e07 -rdabcbbacae0c921b9628e148c2028e9465a76024
--- MessagePayloads.h	(.../MessagePayloads.h)	(revision d01a89232711f7a014fa44fa12203595b9501e07)
+++ MessagePayloads.h	(.../MessagePayloads.h)	(revision dabcbbacae0c921b9628e148c2028e9465a76024)
@@ -110,6 +110,21 @@
     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;
+    U32 minDetectCount;
+    BOOL isDetectionInCountWindow;
+    F32 riseDeltaPsi;
+    BOOL riseHit;
+    U32 requiredRiseCount;
+    U32 spentFillRiseHitCount;
+    F32 lastPrevSpentDialPressure;
+    F32 prevSpentDialPressure;
+#endif
+>>>>>>> LDT-5409-dd-balancing-chamber-stops-duri
 } BAL_CHAMBER_DATA_T;
 
 /// Chamber H vent open request data