Index: firmware/App/Controllers/BalancingChamber.h
===================================================================
diff -u -rcb071d7746fea6b6b6698cc9ba0747f2b8501861 -r20dd19d2358f340210944a064a0f5dfbcc172fb5
--- firmware/App/Controllers/BalancingChamber.h	(.../BalancingChamber.h)	(revision cb071d7746fea6b6b6698cc9ba0747f2b8501861)
+++ firmware/App/Controllers/BalancingChamber.h	(.../BalancingChamber.h)	(revision 20dd19d2358f340210944a064a0f5dfbcc172fb5)
@@ -83,12 +83,9 @@
 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
 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
 
 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