Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r7a1c1fe89abb13803db1961146b7b0d97574de16 -r63be419d72523822693e10767ce3e4cd87aa05b6
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 7a1c1fe89abb13803db1961146b7b0d97574de16)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 63be419d72523822693e10767ce3e4cd87aa05b6)
@@ -246,15 +246,7 @@
     // Trigger alarm if not receiving new DG op mode message in timely manner
     checkDGDataFreshness( ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag );
 
-<<<<<<< HEAD
     // Check to see if DG has restarted*/
-
-    // Trigger alarm if not receiving new DG op mode message in timely manner
-    //checkDGDataFreshness( ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE, &dgDialysateFlowDataFreshFlag ); // DN-31OCT2022 - TODO: Will remove this line???
-
-=======
->>>>>>> DEN-14150-hd-dialysate-flow-estimation
-    // Check to see if DG has restarted
     checkDGRestart();
 
     // Check the status of the trimmer heater
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rc25d707f6f5f2463639425e2efd6876bed974304 -r63be419d72523822693e10767ce3e4cd87aa05b6
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision c25d707f6f5f2463639425e2efd6876bed974304)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 63be419d72523822693e10767ce3e4cd87aa05b6)
@@ -73,6 +73,7 @@
 
 /// Persist time (task intervals) for flow vs. motor speed error condition.
 static const U32 DIP_FLOW_VS_SPEED_PERSIST     = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+//static const U32 DIP_FLOW_VS_SPEED_PERSIST     = ((60 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);   //DN-03NOV2022 - Make it 1 minutes for testing
 /// Persist time (task intervals) for motor off error condition.
 static const U32 DIP_OFF_ERROR_PERSIST         = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
 /// Persist time (task intervals) motor speed error condition.