Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r46c538cc5b7b40ddc8227e2ad1c77bab93716571 -r03eb5e8c4e87cd3c92304f70e661dec1d0055d09
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 46c538cc5b7b40ddc8227e2ad1c77bab93716571)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 03eb5e8c4e87cd3c92304f70e661dec1d0055d09)
@@ -407,7 +407,6 @@
     U08 spReadCtr = getFPGADialysateFlowSlowPacketReadCounter();
     U08 flowErrorCtr = getFPGADialysateFlowErrorCounter();
     U08 flowStatus = getFPGADialysateFlowMeterStatus();
-<<<<<<< HEAD
     F32 dipFlow;
 #ifdef USE_FMD_FLOW_SENSOR
     F32 dpFlow = getFPGADialysateFlow();
@@ -473,8 +472,6 @@
         }
     }
 #endif
-=======
->>>>>>> 954107454f4c5d4cfbdfaefda5cc1cd15b1e18ac
 
     adcDialInPumpMCSpeedRPM.data = (F32)(SIGN_FROM_12_BIT_VALUE(dipRPM)) * DIP_SPEED_ADC_TO_RPM_FACTOR;
     adcDialInPumpMCCurrentmA.data = (F32)(SIGN_FROM_12_BIT_VALUE(dipmA)) * DIP_CURRENT_ADC_TO_MA_FACTOR;