Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r2e6fa30976d3fd57cf43c7e4667d165c973c17b2 -r2f84c4894488f86b2a36c14184c80a1a6b1a7b48
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 2e6fa30976d3fd57cf43c7e4667d165c973c17b2)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 2f84c4894488f86b2a36c14184c80a1a6b1a7b48)
@@ -556,7 +556,20 @@
             }
             else
             {
+<<<<<<< HEAD
+                if ( TRUE != getTestConfigStatus( TEST_CONFIG_DISABLE_DIENER_CONC_PUMP ) )
+                {
+                    pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION_DIENER );
+                }
+                else
+                {
+                    //Restrict FMI pump speed to 48.0 ml/min.
+                    targetSpeed_ml_min = ( targetSpeed_ml_min > CONCENTRATE_PUMP_MAX_SPEED_FMI ) ? CONCENTRATE_PUMP_MAX_SPEED_FMI : targetSpeed_ml_min;
+                    pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION );
+                }
+=======
                 pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION_DIENER );
+>>>>>>> LDT-2198-beta-1.0-fw-integration---dd-im
             }
 
             if ( D11_PUMP == pumpId )
@@ -1055,7 +1068,18 @@
         F32 timePerStep;
         F32 stepPeriodCounts;
 
+<<<<<<< HEAD
+        if ( TRUE != getTestConfigStatus( TEST_CONFIG_DISABLE_DIENER_CONC_PUMP ) )
+        {
+            timePerStep = CONCENTRATE_PUMP_VOLUME_PER_REV_DIENER / ( concentratePumps[ pumpId ].currentPumpSpeed * CONCENTRATE_PUMP_STEP_PER_REV );
+        }
+        else
+        {
+            timePerStep = CONCENTRATE_PUMP_VOLUME_PER_REV / ( concentratePumps[ pumpId ].currentPumpSpeed * CONCENTRATE_PUMP_STEP_PER_REV );
+        }
+=======
         timePerStep = CONCENTRATE_PUMP_VOLUME_PER_REV_DIENER / ( concentratePumps[ pumpId ].currentPumpSpeed * CONCENTRATE_PUMP_STEP_PER_REV );
+>>>>>>> LDT-2198-beta-1.0-fw-integration---dd-im
         stepPeriodCounts = timePerStep / ( CONCENTRATE_PUMP_STEP_PERIOD_RESOLUTION * CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP );
         concentratePumps[ pumpId ].togglePeriodCount = (U16)( stepPeriodCounts + FLOAT_TO_INT_ROUNDUP_OFFSET );
     }
@@ -1130,7 +1154,18 @@
         }
         else if ( FALSE == isPumpPulseWidthOut )
         {
+<<<<<<< HEAD
+            if ( TRUE != getTestConfigStatus( TEST_CONFIG_DISABLE_DIENER_CONC_PUMP ) )
+            {
+                measuredPumpSpeed[ pumpId ].data = ( US_PER_SECOND / pulseWidthInMicroSeconds ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE_DIENER * SEC_PER_MIN;
+            }
+            else
+            {
+                measuredPumpSpeed[ pumpId ].data = ( US_PER_SECOND / pulseWidthInMicroSeconds ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE * SEC_PER_MIN;
+            }
+=======
             measuredPumpSpeed[ pumpId ].data = ( US_PER_SECOND / pulseWidthInMicroSeconds ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE_DIENER * SEC_PER_MIN;
+>>>>>>> LDT-2198-beta-1.0-fw-integration---dd-im
         }
 
         // If pulse width is out of range capture pump out of range, pumpId and pulse width