Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r25f84aa570157389ad37374580a872f0b620a5a3 -r044928ad00c678ecb84940ab5fbf978ee2bcab47
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 25f84aa570157389ad37374580a872f0b620a5a3)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 044928ad00c678ecb84940ab5fbf978ee2bcab47)
@@ -55,8 +55,8 @@
 #define ROP_CONTROL_INTERVAL                           ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< Interval (ms/task time) at which the RO pump is controlled.
 #define ROP_RAMP_UP_CONTROL_INTERVAL                   ( 500 / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the RO pump is controlled.
 #define ROP_RAMP_UP_P_COEFFICIENT                      0.22F                                       ///< P term for RO pump ramp up to flow control.
-#define ROP_FLOW_CONTROL_P_COEFFICIENT                 0.4F                                        ///< P term for RO pump flow control.
-#define ROP_FLOW_CONTROL_I_COEFFICIENT                 0.05F                                       ///< I term for RO pump flow control.
+#define ROP_FLOW_CONTROL_P_COEFFICIENT                 0.25F                                       ///< P term for RO pump flow control.
+#define ROP_FLOW_CONTROL_I_COEFFICIENT                 0.25F                                       ///< I term for RO pump flow control.
 #define ROP_MAX_PRESSURE_P_COEFFICIENT                 0.01F                                       ///< P term for RO pump max pressure control.
 #define ROP_MAX_PRESSURE_I_COEFFICIENT                 0.01F                                       ///< I term for RO pump max pressure control.
 
@@ -408,7 +408,11 @@
             BOOL isFlowOutOfUpperRange = ( isFlowOutOfRange && ( currentFlow > targetFlow ) ? TRUE : FALSE );
             BOOL isFlowOutOfLowerRange = ( isFlowOutOfRange && ( currentFlow < targetFlow ) ? TRUE : FALSE );
 
+<<<<<<< Updated upstream
 //            printf("%s- isFlowOutOfUpperRange: %d, %f, %f\n", __func__, isFlowOutOfUpperRange, currentFlow, targetFlow);      // wjb
+=======
+;;            printf("%s- isFlowOutOfUpperRange: %d, %f, %f\n", __func__, isFlowOutOfUpperRange, currentFlow, targetFlow);      // wjb
+>>>>>>> Stashed changes
 
             checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, isFlowOutOfUpperRange, currentFlow, targetFlow );
             checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, isFlowOutOfLowerRange, currentFlow, targetFlow );