Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r21a1f9847f1ccf22ec8b906bcdadea47ec7b5dc9 -rbfb859737f3d221f08c0f43d1bd4ba7b7680911f
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 21a1f9847f1ccf22ec8b906bcdadea47ec7b5dc9)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision bfb859737f3d221f08c0f43d1bd4ba7b7680911f)
@@ -47,7 +47,6 @@
 static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestConsumableState( void ); ///< Handle Self Test Consumable state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestNoCartState( void );     ///< Handle Self Test No Cart state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void );            ///< Handle Install state during Pre-Treatment
-static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void );        ///< Handle Self Test Dry state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handlePrimeState( void );              ///< Handle Prime state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleRecirculateState( void );        ///< Handle Recirculate state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleRxState( void );                 ///< Handle Confirm Rx state during Pre-Treatment
@@ -109,15 +108,15 @@
     switch ( currentPreTreatmentState )
     {
         case TD_PRE_TREATMENT_WATER_SAMPLE_STATE:
-            // currentPreTreatmentState = handleWaterSampleState();
+            currentPreTreatmentState = handleWaterSampleState();
             break;
 
         case TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE:
-            // currentPreTreatmentState = handleSelfTestConsumableState();
+            currentPreTreatmentState = handleSelfTestConsumableState();
             break;
 
         case TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE:
-            // currentPreTreatmentState = handleSelfTestNoCartState();
+            currentPreTreatmentState = handleSelfTestNoCartState();
             break;
 
         case TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE:
@@ -129,20 +128,19 @@
             break;
 
         case TD_PRE_TREATMENT_PRIME_STATE:
-            // currentPreTreatmentState = handlePrimeState();
+            currentPreTreatmentState = handlePrimeState();
             break;
 
         case TD_PRE_TREATMENT_RECIRCULATE_STATE:
-            // currentPreTreatmentState = handleRecirculateState();
+            currentPreTreatmentState = handleRecirculateState();
             break;
 
         case TD_PRE_TREATMENT_CONFIRM_RX_STATE:
-            // Confirm Rx state
             currentPreTreatmentState = handleRxState();
             break;
 
         case TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE:
-            // currentPreTreatmentState = handlePatientConnectionState();
+            currentPreTreatmentState = handlePatientConnectionState();
             break;
 
         default:
@@ -218,12 +216,33 @@
     // state = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
 
     return state;
->>>>>>> 0675141b5089536135dd205aeb65b62967ec3524
 }
 
 /*********************************************************************//**
+ * The handleInstallState function calls Tube Set Install Service and
+ * advances to Self Test Dry state once the service signals
+ * completion.
+ * @details \b Inputs: none
+ * @details \b Outputs: Advances Pre-Treatment state when install is complete.
+ * @return next Pre-Treatment mode state
+ *************************************************************************/
+static TD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void )
+{
+    TD_PRE_TREATMENT_MODE_STATE_T state = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
+
+    // call tube set install service to auto-load tube set
+    execTubeSetInstall();
+
+    if ( TRUE == isTubeSetInstallComplete() )
+    {
+        state = TD_PRE_TREATMENT_SELF_TEST_DRY_STATE;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
  * @brief
-<<<<<<< HEAD
  * The handleSelfTestDryState function performs dry self-test.
  * @details \b Inputs: none
  * @details \b Outputs: transition to prime state on user request
@@ -245,7 +264,7 @@
     if ( TRUE == tubeSetInstallRequested )
     {
         tubeSetInstallRequested = FALSE;
-        state = TD_PRE_TREATMENT_CART_INSTALL_STATE;
+        state = TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
     }
 
     if ( DRY_SELF_TESTS_COMPLETE_STATE == getDrySelfTestsState() )
@@ -254,60 +273,15 @@
         {
             submodeCompleteTransitionTimeCounter = 0;
             state = TD_PRE_TREATMENT_CONFIRM_RX_STATE;
+            // TODO
 //            transitionToPrime();
         }
     }
-
-=======
- * The handleInstallState function calls Tube Set Install Service and
- * advances to Self Test Dry state once the service signals
- * completion.
- * @details \b Inputs: none
- * @details \b Outputs: Advances Pre-Treatment state when install is complete.
- * @return next Pre-Treatment mode state
- *************************************************************************/
-static TD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void )
-{
-    TD_PRE_TREATMENT_MODE_STATE_T state = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
-
-    // call tube set install service to auto-load tube set
-    execTubeSetInstall();
-
-    if ( TRUE == isTubeSetInstallComplete() )
-    {
-        state = TD_PRE_TREATMENT_SELF_TEST_DRY_STATE;
-    }
-
     return state;
 }
 
 /*********************************************************************//**
  * @brief
- * The handleSelfTestDryState function executes the Self Test Dry state
- * of pre-treatment mode.
- * @details \b Inputs: TODO fill up if any
- * @details \b Outputs: TODO fill up if any
- * @return next Pre-Treatment mode state.
- *************************************************************************/
-static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void )
-{
-    TD_PRE_TREATMENT_MODE_STATE_T state = TD_PRE_TREATMENT_SELF_TEST_DRY_STATE;
-
-    if ( TRUE == goToInstallStateRequested )
-    {
-        goToInstallStateRequested = FALSE;
-        initTubeSetInstall();
-        state = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
-    }
-
-    // TODO: Transition to Prime state on completion when implemented
-    // state = TD_PRE_TREATMENT_PRIME_STATE;
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
  * The handlePrimeState function executes the Prime state of
  * pre-treatment mode.
  * @details \b Inputs: TODO fill up if any
@@ -339,7 +313,6 @@
     // TODO: Transition to Confirm RX state on completion when implemented
     // state = TD_PRE_TREATMENT_CONFIRM_RX_STATE;
 
->>>>>>> 0675141b5089536135dd205aeb65b62967ec3524
     return state;
 }