Index: firmware/App/Controllers/BalancingChamber.h
===================================================================
diff -u -r847659965e5823e2e25db62c14f4611db9527f8a -r6d0f8d5cdbabf69ff29bde4a4b8c2508e7030861
--- firmware/App/Controllers/BalancingChamber.h	(.../BalancingChamber.h)	(revision 847659965e5823e2e25db62c14f4611db9527f8a)
+++ firmware/App/Controllers/BalancingChamber.h	(.../BalancingChamber.h)	(revision 6d0f8d5cdbabf69ff29bde4a4b8c2508e7030861)
@@ -83,6 +83,15 @@
 F32 getBalancingChamberError( void );                                    // Get balancing chamber error to adjust UF rate.
 F32 getBicarbDoseVol( void );                                            // Get liquid bicarb dose volume
 F32 getAcidDoseVol( void );                                              // Get acid dose volume
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+BOOL getBalancingChamberStatus(void);                                    // Get Balancing Chamber Switching Status
+=======
+BOOL isBalChamberSwitchImminent( void );                                 // Get the balancing chamber is within the valve-close window (50 ms) before switching.
+BOOL getBalChamberFreshSideValvesClosedStatus( void );                   // Get the balancing chamber fresh side valve close status
+>>>>>>> origin/staging
+>>>>>>> bugfix/LDT-4500-dd-alarm-75-and-pressure-build-
 
 BOOL testDDBalChamberDataPublishIntervalOverride( MESSAGE_T *message );  // To override the balancing chamber data publish interval
 BOOL testBalChamberSwFreqOverride( MESSAGE_T *message );                 // To override the balancing chamber switching frequency