Index: tst_ui_alarms_dialog/test.py
===================================================================
diff -u -rd0369ab5723ecf6eb343d9cd13da450db7c4e511 -r717af61d7153f451616a3880c80b22239fd0a8f2
--- tst_ui_alarms_dialog/test.py	(.../test.py)	(revision d0369ab5723ecf6eb343d9cd13da450db7c4e511)
+++ tst_ui_alarms_dialog/test.py	(.../test.py)	(revision 717af61d7153f451616a3880c80b22239fd0a8f2)
@@ -20,11 +20,7 @@
 from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator
 
 ALARM_EXPIRES_TIME = (0, 10, 20, 30, 30, 100)
-<<<<<<< HEAD
 ALARM_ID_COMBINATION = (2, 3, 5, 7, 10, 15, 20, 25, 30, 50)
-=======
-alarm_id_combination = (2, 3, 5, 7, 10, 15, 20, 25, 30, 50)
->>>>>>> 113105afce3fdad8266d659c89d8fc95bfad16f9
 
 logging.basicConfig(filename='log_file.log',level=logging.INFO, datefmt='%d-%b-%y %H:%M:%S')
 hd_simulator = HDSimulator()
@@ -247,11 +243,7 @@
     flag_unmute = alarm.cmd_make_alarm_flags(alarms_silenced=0)          
            
     mouseClick(waitForObjectExists(names.o_alarm_button_mute))
-<<<<<<< HEAD
     for alarm_id in ALARM_ID_COMBINATION:   
-=======
-    for alarm_id in alarm_id_combination:   
->>>>>>> 113105afce3fdad8266d659c89d8fc95bfad16f9
         for alarm_index in range(config.NUM_OF_ALARM_PRIORITIES):
             alarm.cmd_activate_alarm_id(state = alarm_index,
                                         alarm = alarm_id,