Index: tst_ui_logs/test.py
===================================================================
diff -u -r9ad949449d944413e2f9167de7e5c859c079085c -r18aed25f7f1a0dd0dda7e6aeb2186be17f24fa7d
--- tst_ui_logs/test.py	(.../test.py)	(revision 9ad949449d944413e2f9167de7e5c859c079085c)
+++ tst_ui_logs/test.py	(.../test.py)	(revision 18aed25f7f1a0dd0dda7e6aeb2186be17f24fa7d)
@@ -455,8 +455,12 @@
     payload += unsigned_integer_to_bytearray(30)
     payload += unsigned_integer_to_bytearray(22)
     dg_simulator.cmd_send_dg_general_response(message_id=45, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) 
+<<<<<<< HEAD
     verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures")
      
+=======
+          
+>>>>>>> parent of 8d608ca... Adding message_id's belongs to 0x8000
     #0x3100
     dg_simulator.cmd_send_dg_conductivity_data(ro_rejection_ratio = 1.0, cpi_conductivity = 2.0,
     cpo_conductivity = 3.0, cd1_conductivity = 4.0,
@@ -1036,7 +1040,11 @@
     payload += float_to_bytearray(1.2)
     payload += unsigned_integer_to_bytearray(2) 
     dg_simulator.cmd_send_dg_general_response(message_id=31, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload)
+<<<<<<< HEAD
     verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value, msg = "ROPump")
+=======
+    verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value)
+>>>>>>> parent of 8d608ca... Adding message_id's belongs to 0x8000
        
     #0x2400
     payload = unsigned_integer_to_bytearray(1)
@@ -1051,7 +1059,28 @@
     payload += unsigned_integer_to_bytearray(1)
     dg_simulator.cmd_send_dg_general_response(message_id=39, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload)
     verify_log(msg_id = MsgIds.MSG_ID_DG_OP_MODE.value, msg = "OpMode")
+<<<<<<< HEAD
           
+=======
+       
+    #0x2D00
+    payload = float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    dg_simulator.cmd_send_dg_general_response(message_id=45, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload)
+    verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures")
+  
+>>>>>>> parent of 8d608ca... Adding message_id's belongs to 0x8000
     #0xB100
     payload = unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(1)
@@ -1103,6 +1132,7 @@
     verify_log(msg = "~HD_Blood_Pump_Rotor_Count", param = [1,2])
 
 
+<<<<<<< HEAD
     #Verification of Dialin->DG API's data from unhandled.conf file channel ID: 400
     #0xA001
     payload = unsigned_integer_to_bytearray(1)
@@ -1119,5 +1149,25 @@
     verify_log(msg = "~DG_Watchdog_Check_In", param = [1,1,1])
 
 
+=======
+
+
+    #Verification of Dialin->DG API's data from unhandled.conf file channel ID: 400
+    #0xA001
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id = 40961, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Alarm_State", param = [1,1,1])
+
+    #0xA002
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id = 40962, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Watchdog_Check_In", param = [1,1,1])
+
+
+>>>>>>> parent of 8d608ca... Adding message_id's belongs to 0x8000
     utils.tstDone()