Index: tst_standbymode/test.py
===================================================================
diff -u -rf10445f970d9504bffcd0d213376da58abcccd9d -rb60f5a350ee7a81199c005f23bc794fc1c0e9831
--- tst_standbymode/test.py	(.../test.py)	(revision f10445f970d9504bffcd0d213376da58abcccd9d)
+++ tst_standbymode/test.py	(.../test.py)	(revision b60f5a350ee7a81199c005f23bc794fc1c0e9831)
@@ -105,16 +105,11 @@
 
 def main():
     
-<<<<<<< HEAD
-    utils.tstStart("tst_standbymode")
-    
-    
-    utility.start_application(config.AUT_NAME)
-=======
+
     utils.tstStart(__file__)
     startApplication(config.AUT_NAME)
->>>>>>> 50a76caec4a97fcdeb026d0ea7ec9c2d3c38bfeb
 
+
     hd_simulator.cmd_send_power_on_self_test_version_request()
     hd_simulator.cmd_send_hd_operation_mode(HDOpModes.MODE_STAN.value)