Index: shared/scripts/configuration/config.py
===================================================================
diff -u -rc6dc5afec58e889f58b022fa64549935271d61c4 -r40866d7d92b001f610837157fc1575bb083d2aac
--- shared/scripts/configuration/config.py	(.../config.py)	(revision c6dc5afec58e889f58b022fa64549935271d61c4)
+++ shared/scripts/configuration/config.py	(.../config.py)	(revision 40866d7d92b001f610837157fc1575bb083d2aac)
@@ -728,3 +728,8 @@
     "OPTION_11" : {"uf_maximum" : 1000, "uf_minimum" : 0},
     "OPTION_12" : {"uf_maximum" : 1250, "uf_minimum" : 0},
     }
+=======
+ACCEPTED = True
+REJECTED = False
+
+>>>>>>> main_treatment_ultrafilteration
Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -r5596042bd1d22d67d902fb6c599dad89f9ada086 -r40866d7d92b001f610837157fc1575bb083d2aac
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision 5596042bd1d22d67d902fb6c599dad89f9ada086)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 40866d7d92b001f610837157fc1575bb083d2aac)
@@ -458,9 +458,7 @@
     
 def expected_heparin_value(val):
     names.o_heparin_value["text"] = val
-    return names.o_heparin_value
-
-
+    return names
 def msg(string):
     """
     Added ### at the right side of the string to make sure that it is a message.
@@ -820,3 +818,4 @@
 def convert_seconds_into_min_and_sec(seconds, format="%M:%S"):
     min_and_sec = time.strftime(format, time.gmtime(seconds))
     return min_and_sec
+
Index: shared/scripts/names.py
===================================================================
diff -u -r5fc090d265746e76db1b15a4ccf99a69296916e0 -r40866d7d92b001f610837157fc1575bb083d2aac
--- shared/scripts/names.py	(.../names.py)	(revision 5fc090d265746e76db1b15a4ccf99a69296916e0)
+++ shared/scripts/names.py	(.../names.py)	(revision 40866d7d92b001f610837157fc1575bb083d2aac)
@@ -217,6 +217,11 @@
 o_ultrafiltration_closeButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton", "unnamed": 1, "visible": True}
 o_backbutton_backbutton = {"container": o_Overlay, "id": "_backButton", "type": "BackButton", "unnamed": 1, "visible": True}
 o_notificationbar_response = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
+o_ultrafilteration_pause_btn = {"container": o_Overlay, "text": "PAUSE ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True}
+o_ultrafilteration_resume_btn = {"container": o_Overlay, "text": "RESUME ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True}
+o_ultrafilteration_back_btn = {"container": o_Overlay, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True}
+o_ultrafilteration_texts ={"container": o_Overlay, "type": "Text", "unnamed": 1, "visible": True}
+o_ultrafilteration_confirm_btn = {"container": o_Overlay, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}
 
 #flows
 o_treatment_blood_flow_touch_area = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "FLOWS", "type": "Text", "unnamed": 1, "visible": True}
@@ -614,3 +619,4 @@
 o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True}
 o_treatmentHome_START_BOLUS_Text = {"container": o_treatmentHome, "text": "START BOLUS", "type": "Text", "unnamed": 1, "visible": True}
 o_treatmentHome_fluidProgressBar_ProgressBar = {"container": o_treatmentHome, "id": "_fluidProgressBar", "type": "ProgressBar", "unnamed": 1, "visible": True}
+
Index: suite.conf
===================================================================
diff -u -r03b5230f7cecbb728de9357e4582cf381b24cba2 -r40866d7d92b001f610837157fc1575bb083d2aac
--- suite.conf	(.../suite.conf)	(revision 03b5230f7cecbb728de9357e4582cf381b24cba2)
+++ suite.conf	(.../suite.conf)	(revision 40866d7d92b001f610837157fc1575bb083d2aac)
@@ -5,6 +5,10 @@
 IMPLICITAUTSTART=0
 LANGUAGE=Python
 OBJECTMAPSTYLE=script
+<<<<<<< HEAD
 TEST_CASES=tst_environment tst_post tst_standbymode tst_In_treatment tst_main_treatment_pressure tst_treatment_blood_dialysateflow_rate tst_main_treatment_vitals tst_ui_alarms_list tst_ui_alarms_dialog tst_main_treatment_ultrafilteration tst_main_treatment_heparin tst_pre_treatment_priming pre_treatment_disposables pre_treatment_patient_connection
+=======
+TEST_CASES=tst_environment tst_post tst_standbymode tst_case1 tst_main_treatment_uf_adjustments
+>>>>>>> main_treatment_ultrafilteration
 VERSION=3
 WRAPPERS=Qt