Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rd23f94b810d65dd54809b0bfeb32f0f763051d4d -r7a1c1fe89abb13803db1961146b7b0d97574de16
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision d23f94b810d65dd54809b0bfeb32f0f763051d4d)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 7a1c1fe89abb13803db1961146b7b0d97574de16)
@@ -49,7 +49,6 @@
 #define DIALYSATE_TEMP_LOW_SAFETY_LIMIT_C        42.0F                       ///< Dialysate low safety temperature limit in C.
 #define DIALYSATE_TEMP_LOW_SAFETY_TIMEOUT_MS     ( 10 * MS_PER_SECOND )      ///< Dialysate temperature low safety timeout in milliseconds.
 #define DG_DATA_FRESHNESS_TIMEOUT_MS             ( 3 * MS_PER_SECOND )       ///< DG data freshness timeout (in ms).
-#define DIALYSATE_FLOW_FRESHNESS_TIMEOUT_MS      ( 60 * MS_PER_SECOND )      ///< Dialysate flow freshness timeout (in ms). // DN-31OCT2022
 
 // ********** private data **********
 
@@ -191,7 +190,6 @@
     initPersistentAlarm( ALARM_ID_HD_NEW_DIALYSATE_TEMPERATURE_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE, DIALYSATE_FLOW_FRESHNESS_TIMEOUT_MS, DIALYSATE_FLOW_FRESHNESS_TIMEOUT_MS ); // DN-31OCT2022
 }
 
 /**********************************************************************//**
@@ -248,11 +246,14 @@
     // 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();