Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r9f403b860d7767f4fb07e13692ccdc9852a42105 -rfaab97b2d78bb89245d9805f569849cba1ec6169
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 9f403b860d7767f4fb07e13692ccdc9852a42105)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision faab97b2d78bb89245d9805f569849cba1ec6169)
@@ -502,11 +502,7 @@
         // to target pressure straight. At the beginning the maximum pressure is set in the targetROPumpPressure override variable.
         // If the flow rate was reached without reaching to maximum pressure, the pressure that was set to targetROPumpPressure override will
         // be reset to the corresponding pressure of the target flow rate.
-<<<<<<< HEAD
-        if ( actualPressure > getTargetROPumpPressure() || ( getTargetROPumpPressure() - actualPressure ) < MAX_PRESSURE_TARGET_TOLERANCE )
-=======
         if ( ( actualPressure > targetPressure ) || ( ( targetPressure - actualPressure ) < MAX_PRESSURE_TARGET_TOLERANCE ) )
->>>>>>> staging
         {
             result = RO_PUMP_CONTROL_TO_TARGET_STATE;
         }