Index: suite.conf
===================================================================
diff -u -r40866d7d92b001f610837157fc1575bb083d2aac -r832ebd77e926ca21aba6b238ef0b329acb7c7288
--- suite.conf	(.../suite.conf)	(revision 40866d7d92b001f610837157fc1575bb083d2aac)
+++ suite.conf	(.../suite.conf)	(revision 832ebd77e926ca21aba6b238ef0b329acb7c7288)
@@ -5,10 +5,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 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