Index: suite.conf
===================================================================
diff -u -r4798b078bb6825fd693921aa54f636741cff0051 -r8022d2716a79cbb147fa8976606720c566a7b864
--- suite.conf	(.../suite.conf)	(revision 4798b078bb6825fd693921aa54f636741cff0051)
+++ suite.conf	(.../suite.conf)	(revision 8022d2716a79cbb147fa8976606720c566a7b864)
@@ -4,10 +4,6 @@
 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
-=======
-TEST_CASES=tst_environment tst_post tst_standbymode tst_In_treatment
->>>>>>> origin/diality_initialization_screen
+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
 VERSION=3
 WRAPPERS=Qt