Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -ra1f14a4e422f94b6bc25d1b91839761e7e1196d7 -r95c81a7d81fa3e6534bcf2e35e1d9b1eba26e372
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision a1f14a4e422f94b6bc25d1b91839761e7e1196d7)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 95c81a7d81fa3e6534bcf2e35e1d9b1eba26e372)
@@ -24,6 +24,7 @@
 #include "Messaging.h"
 #include "ModeService.h"
 #include "ModeTreatment.h"
+#include "ModeTreatment.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "Pressures.h"
@@ -192,9 +193,15 @@
         initBloodPrime();
         initDialysis();
         initTreatmentPaused();
+<<<<<<< HEAD
+//        initRinseback();
+//        initTreatmentRecirc();
+        initTreatmentEnd();
+=======
         initRinseback();
         initTreatmentRecirc();
 //        initTreatmentEnd();
+>>>>>>> staging
         initFluidBolus();
 
         // Started the treatment - set the start time in epoch
@@ -750,7 +757,8 @@
 //        sendLastTreatmentPeriodicData = TRUE;
 //        treatmentEndTimeStamp = getRTCTimestamp();
         pauseDialysis();
-        requestNewOperationMode( MODE_STAN ); // TODO transitionToTreatmentEnd();
+        //requestNewOperationMode( MODE_STAN ); // TODO
+        transitionToTreatmentEnd();
         //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_END_OF_TREATMENT_WARNING, presTreatmentTimeSecs );
         result = TREATMENT_END_STATE;
     }
@@ -928,7 +936,7 @@
 {
     TREATMENT_STATE_T result = TREATMENT_END_STATE;
 
-//    // Handle final rinseback alarm response from user
+    // Handle final rinseback alarm response from user
 //    if ( TRUE == initiateRinsebackAlarmResponseRequest )
 //    {
 //        signalTreatmentEndAlarmRinsebackUserAction();