Index: suite_leahi/suite.conf
===================================================================
diff -u -r6f50d4bea7fb93aa7c03d1aa0e98cc7e5e9cd859 -r9751968c3118396daa677c2e95961aba5b0bf001
--- suite_leahi/suite.conf	(.../suite.conf)	(revision 6f50d4bea7fb93aa7c03d1aa0e98cc7e5e9cd859)
+++ suite_leahi/suite.conf	(.../suite.conf)	(revision 9751968c3118396daa677c2e95961aba5b0bf001)
@@ -1,10 +1,6 @@
 AUT=leahi
 LANGUAGE=Python
 OBJECTMAPSTYLE=script
-<<<<<<< HEAD
-TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_patient_vitals
-=======
-TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin
->>>>>>> origin/staging
+TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin tst_patient_vitals
 VERSION=3
 WRAPPERS=Qt