Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r7d85bc16d7e6a209a28d0152c8cd7da5d5af1be2 -rb3423232af3c7add435cf58646e8956f99e45ffd
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 7d85bc16d7e6a209a28d0152c8cd7da5d5af1be2)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision b3423232af3c7add435cf58646e8956f99e45ffd)
@@ -63,7 +63,6 @@
 #define LOW_DIAL_FLOW_RATE                              150.0F                                      ///< Dialysate flow rate lesser than 150 considered to be low Qds.
 #define ZERO_DIAL_FLOW_RATE                             0.0F                                        ///< Zero dialysate flow rate
 #define SPENT_CHAMBER_FILL_MAX_COUNT                    10                                          ///< Total number of spent chamber fill allowed.
-<<<<<<< HEAD
 #define BICARB_CHAMBER_FILL_TIMEOUT                    ( 1 * MS_PER_SECOND )                        ///< Bicarb chamber fill timeout.
 #define B1B2_HEAT_DIS_FIRST_COEFF                      0.00000000487858F                            ///< First coefficient for Heat loss dissipation calculation from D4 to D28(cubic equation).
 #define B1B2_HEAT_DIS_SEC_COEFF                        0.0000063124F                                ///< Second coefficient for Heat loss dissipation calculation from D4 to D28.
@@ -73,10 +72,8 @@
 #define B3_HEAT_DIS_SEC_COEFF                          0.0000085278F                                ///< Second coefficient for Heat loss dissipation calculation from D28 to Dialyzer.
 #define B3_HEAT_DIS_THIRD_COEFF                        0.0035126F                                   ///< Third coefficient for Heat loss dissipation calculation from D28 to Dialyzer.
 #define B3_HEAT_DIS_FOURTH_COEFF                       0.63893F                                     ///< Fourth coefficient for Heat loss dissipation calculation from D28 to Dialyzer.
-
-=======
 #define BICARB_CHAMBER_FILL_TIMEOUT                     ( 1 * MS_PER_SECOND )                       ///< Bicarb chamber fill timeout.
->>>>>>> staging
+
 //Testing
 #define DELAY_BC_SWITCHING_AT_START_UP          ( 10 * MS_PER_SECOND )                              ///< Provide a balancing chamber switching start up delay to stabilize pump speed etc.,
 /// Payload record structure for Gen dialysate execution state set request