Index: shared/scripts/configuration/config.py
===================================================================
diff -u -r4e525fac94941a1451bd54f2390f47ece7f4f1b0 -r0efaa7742df2c4138f358784c9f5e3cd68e03201
--- shared/scripts/configuration/config.py	(.../config.py)	(revision 4e525fac94941a1451bd54f2390f47ece7f4f1b0)
+++ shared/scripts/configuration/config.py	(.../config.py)	(revision 0efaa7742df2c4138f358784c9f5e3cd68e03201)
@@ -655,6 +655,7 @@
 SALINE_UNIT = "mL"
 BLOOD_PRIMING_DEFAULT_VALUE = "0 mL"
 
+<<<<<<< HEAD
 #Pre-Treatment Disposables
 NEXT_BUTTON_TEXT = "NEXT"
 BACK_BUTTON_TEXT = "BACK"
@@ -726,3 +727,38 @@
     "OPTION_11" : {"uf_maximum" : 1000, "uf_minimum" : 0},
     "OPTION_12" : {"uf_maximum" : 1250, "uf_minimum" : 0},
     }
+=======
+CURRENT_COLOR =  '#000000'                          
+COMPLETE_COLOR=  '#000000'
+ENABLED_COLOR = '#fcfcfc'                           
+INCOMPLETE_COLOR = '#607a91'
+END_TREATMENT_SCREEN = ["Rinseback Setup", "Recirculate", "Treatment Complete", "Treatment Paused State"]
+RINSE_BACK_SETUP_TEXT = "Rinseback Setup"
+RECIRCULATE_TEXT = "Recirculate"
+RINSEBACK_BUTTON_TEXT = "START RINSEBACK"
+END_TREATMENT_COMPLETE_STATE_TEXT = "Treatment Complete"
+END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT = "Treatment Complete Paused"
+RECONNECT_BUTTON_TEXT = "RECONNECT"
+END_IMAGE_BUTTON_TEXT = "End"
+DECELERATE_BUTTON_TEXT = "Decelerate"
+ACCELERATE_BUTTON_TEXT = "Accelerate"
+PAUSE_BUTTON_TEXT = "Pause"
+RESUME_BUTTON_TEXT = "Resume"
+RINSEBACK_TEXT = "Rinseback"
+RINSEBACK_COMPLETE_TEXT = "Rinseback Complete"
+END_TREATMENT_BUTTON_TEXT = "END TREATMENT"
+ADDITIONAL_BUTTON_TEXT = "ADDITIONAL"
+ADDITIONAL_RINSEBACK_TEXT = "Additional Rinseback"
+RECONNECT_TEXT = "Reconnect"
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> abb7d9b36236a4b6f4f9716f2ab1b863572092f9
Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -re668ae1e012a1ab6ed5b1ff62f7001f977049ded -r0efaa7742df2c4138f358784c9f5e3cd68e03201
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision e668ae1e012a1ab6ed5b1ff62f7001f977049ded)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 0efaa7742df2c4138f358784c9f5e3cd68e03201)
@@ -11,7 +11,10 @@
 #
 ############################################################################
 
+<<<<<<< HEAD
 import object
+=======
+>>>>>>> abb7d9b36236a4b6f4f9716f2ab1b863572092f9
 import names
 import sys
 import squish
@@ -450,6 +453,7 @@
         
     raise LookupError("value object is not in view to the user after " + \
              "trying 100 times")
+<<<<<<< HEAD
     
 
 def expected_heparin_value(val):
@@ -581,6 +585,20 @@
             test.compare(bullet_border_color, config.INCOMPLETE_COLOR)     
     test.endSection()      
             
+=======
+
+def get_bullet_object(screen_obj, num):
+    """
+        To obtain a bullet object based on occurrence provided.
+        @param screen_obj: provides the container on which the bullet must be present
+        @param num: provides the occurrence value 
+        @returns a real name object
+    """     
+    names.o_bullet_object["container"] = screen_obj
+    names.o_bullet_object["occurrence"] = num + 1
+    return names.o_bullet_object 
+
+>>>>>>> abb7d9b36236a4b6f4f9716f2ab1b863572092f9
 def verify_missing_object(object_to_check):
     """ 
     Method to verify the given object is invisible or is not present on the screen
@@ -593,6 +611,7 @@
     except LookupError as _:
         test.passes("object is not present as expected")
         
+<<<<<<< HEAD
     squish.testSettings.objectNotFoundDebugging = True    
     
 def set_arterial_ranges_min_val(art_low):
@@ -798,3 +817,6 @@
     indicators = object.children(indicator_parent)
     return indicators
 
+=======
+    squish.testSettings.objectNotFoundDebugging = True   
+>>>>>>> abb7d9b36236a4b6f4f9716f2ab1b863572092f9
Index: shared/scripts/names.py
===================================================================
diff -u -r4e525fac94941a1451bd54f2390f47ece7f4f1b0 -r0efaa7742df2c4138f358784c9f5e3cd68e03201
--- shared/scripts/names.py	(.../names.py)	(revision 4e525fac94941a1451bd54f2390f47ece7f4f1b0)
+++ shared/scripts/names.py	(.../names.py)	(revision 0efaa7742df2c4138f358784c9f5e3cd68e03201)
@@ -225,6 +225,7 @@
 o_handler_Rectangle = {"container": o_Overlay, "gradient": 0, "id": "_handler", "type": "Rectangle", "unnamed": 1, "visible": True}
 o_treatment_saline_notification_msg = {"container": o_treatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True}
 
+<<<<<<< HEAD
 
 #vitals 
 #vitals title text on main-treatment screen
@@ -248,6 +249,46 @@
 o_pop_up_systolic_input_field = {"container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True}
 o_pop_up_diastolic_input_field = {"container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "occurrence": 2, "type": "TextInput", "unnamed": 1, "visible": True}
 o_pop_up_heart_rate_input_field = {"backgroundcolor": "#254670", "container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "occurrence": 3, "type": "TextInput", "unnamed": 1, "visible": True}
+=======
+#end -treatment
+o_text_object = {"type": "Text", "unnamed": 1, "visible": True}
+o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRinsebackStack", "type": "EndTreatmentRinsebackStack", "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinsebackInit", "type": "EndTreatmentRinsebackInit", "visible": True}
+o_EndTreatmentRinsebackInit_rightImage_Image = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackInit_leftImage_Image = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRinsebackStack", "type": "EndTreatmentRinsebackStack", "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinsebackInit", "type": "EndTreatmentRinsebackInit", "visible": True}
+o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRecirculateStack", "type": "EndTreatmentRecirculateStack", "visible": True}
+o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase = {"container": o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack, "objectName": "_EndTreatmentBase", "type": "EndTreatmentBase", "visible": True}
+o_rinse_back_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "Rinseback Setup", "type": "Text", "unnamed": 1, "visible": True}
+o_recirculate_text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Recirculate", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentEndStack_EndTreatmentEndStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentEndStack", "type": "EndTreatmentEndStack", "visible": True}
+o_EndTreatmentEndStack_EndTreatmentBase_EndTreatmentBase = {"container": o_EndTreatmentEndStack_EndTreatmentEndStack, "objectName": "_EndTreatmentBase", "type": "EndTreatmentBase", "visible": True}
+o_end_treatment_complete_state = {"container": o_EndTreatmentEndStack_EndTreatmentBase_EndTreatmentBase, "text": "Treatment Complete", "type": "Text", "unnamed": 1, "visible": True}
+o_end_treatment_complete_paused_state = {"container": o_EndTreatmentEndStack_EndTreatmentBase_EndTreatmentBase, "text": "Treatment Complete Paused", "type": "Text", "unnamed": 1, "visible": True}
+o_reconnect_button = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "gradient": 0, "type": "TouchRect", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_rightImage_Image = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_leftImage_Image = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_TouchRect = {"container": o_EndTreatmentEndStack_EndTreatmentBase_EndTreatmentBase,"gradient": 0, "objectName": "_rinsebackButton", "type": "TouchRect", "unnamed": 1, "visible": True}
+o_start_rinseback_button_text = {"container": o_EndTreatmentEndStack_EndTreatmentBase_EndTreatmentBase, "text": "START RINSEBACK", "type": "Text", "unnamed": 1, "visible": True}
+o_rinseback_setup_rinseback_button = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "START RINSEBACK", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_RECONNECT_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "RECONNECT", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinseback", "type": "EndTreatmentRinseback", "visible": True}
+o_EndTreatmentRinseback_imageEnd_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageEnd", "source": "qrc:/images/iRedCrossWCircle", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_imageDecelerate_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageDecelerate", "source": "qrc:/images/iDecelerate", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_imageAccelerate_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageAccelerate", "source": "qrc:/images/iAccelerate", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_imagePause_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imagePause", "source": "qrc:/images/iPauseLightBlue", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "Rinseback", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_imageResume_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageResume", "source": "qrc:/images/iResume", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinsebackComplete", "type": "EndTreatmentRinsebackComplete", "visible": True}
+o_EndTreatmentRinsebackComplete_Rinseback_Complete_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "Rinseback Complete", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackComplete_END_TREATMENT_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackComplete_ADDITIONAL_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "ADDITIONAL", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentAdditional", "type": "EndTreatmentBase", "visible": True}
+o_EndTreatmentAdditional_Additional_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "text": "Additional Rinseback", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_Reconnect_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Reconnect", "type": "Text", "unnamed": 1, "visible": True}
+>>>>>>> abb7d9b36236a4b6f4f9716f2ab1b863572092f9
 
 # pre-treatment patient connection 
 o_PreTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True}