Index: shared/scripts/configuration/config.py
===================================================================
diff -u -ra9d167d94c04e2ffed88e81820ed307fbde2007b -rb575f65fdac844229ace1dab1b00ffba231a1314
--- shared/scripts/configuration/config.py	(.../config.py)	(revision a9d167d94c04e2ffed88e81820ed307fbde2007b)
+++ shared/scripts/configuration/config.py	(.../config.py)	(revision b575f65fdac844229ace1dab1b00ffba231a1314)
@@ -463,6 +463,8 @@
 SUBNET_MASK = "255.255.255.0"
 DNS = "0.0.0.0"
 
-ACK_REQ_STATUS = 'Ack Req'
-ACK_BAK_STATUS = 'Ack Bak'
+#ui_logs
+RESET_BINARY = "0<B>"                   
+SET_BINARY = "1<B>" 
 
+
Index: shared/scripts/configuration/strings.py
===================================================================
diff -u -r3698b5cf83c5944115b66480f071aeb0d26d0165 -rb575f65fdac844229ace1dab1b00ffba231a1314
--- shared/scripts/configuration/strings.py	(.../strings.py)	(revision 3698b5cf83c5944115b66480f071aeb0d26d0165)
+++ shared/scripts/configuration/strings.py	(.../strings.py)	(revision b575f65fdac844229ace1dab1b00ffba231a1314)
@@ -70,13 +70,6 @@
 BACK_TO_RECIRCULATE_TEXT = "BACK TO RECIRCULATE"
 RECONNECT_TEXT = "Reconnect"
 
-
-
-#tst_treatment_saline_data
-SALINE_UNIT = "mL"
-ACK_REQ_STATUS = 'Ack Req'
-ACK_BAK_STATUS = 'Ack Bak'
-
 #main treatment pressure
 PRESSURE_TITLE = "PRESSURES"
 ARTERIAL_TITLE = "Arterial"
@@ -86,7 +79,6 @@
 LOW_TEXT = "LOW"
 HIGH_TEXT = "HIGH"
 
-
 #main-treatment heparin 
 HEPARIN_TEXT = "HEPARIN"
 HEPARIN_UNIT = "mL"
@@ -850,8 +842,6 @@
 
 BLOOD_PRIMING_TEXT = "Blood Priming"
 SALINE_UNIT = "mL"
-BLOOD_PRIMING_UNIT = "mL"
-BLOOD_PRIMING_VALUE_0 = "0"
-BLOOD_PRIMING_DEFAULT_VALUE = BLOOD_PRIMING_VALUE_0 + " " + BLOOD_PRIMING_UNIT
 
 
+
Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -ra9d167d94c04e2ffed88e81820ed307fbde2007b -rb575f65fdac844229ace1dab1b00ffba231a1314
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision a9d167d94c04e2ffed88e81820ed307fbde2007b)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision b575f65fdac844229ace1dab1b00ffba231a1314)
@@ -1117,3 +1117,4 @@
             squish.mouseWheel(ScreenObj, screenWidth//2, screenHeight//2, 0, -50, squish.Qt.NoModifier)   
     raise LookupError("value object is not in view to the user after trying 100 times")
 
+
Index: suite.conf
===================================================================
diff -u -rdfe6dbd55749bab2f8390a241c1ac3df9e918389 -rb575f65fdac844229ace1dab1b00ffba231a1314
--- suite.conf	(.../suite.conf)	(revision dfe6dbd55749bab2f8390a241c1ac3df9e918389)
+++ suite.conf	(.../suite.conf)	(revision b575f65fdac844229ace1dab1b00ffba231a1314)
@@ -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_ultrafiltration tst_main_treatment_heparin tst_pre_treatment_priming pre_treatment_disposables pre_treatment_patient_connection tst_unhandled_message_log tst_instructions_poc tst_service_screen tst_cloud_sync_device_registration tst_rinseback_setup tst_recirculate tst_settings_information tst_cloud_sync - treatment_screen
+=======
+TEST_CASES=tst_environment tst_post tst_standbymode tst_In_treatment tst_dialin_logs
+>>>>>>> dialin_log
 VERSION=3
 WRAPPERS=Qt