Index: tst_post/test.py
===================================================================
diff -u -r4798b078bb6825fd693921aa54f636741cff0051 -rfed7c8b5a54773c39ada56105305174959a8a7be
--- tst_post/test.py	(.../test.py)	(revision 4798b078bb6825fd693921aa54f636741cff0051)
+++ tst_post/test.py	(.../test.py)	(revision fed7c8b5a54773c39ada56105305174959a8a7be)
@@ -1,44 +1,21 @@
 # -*- coding: utf-8 -*-
-
-##
 # Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
 # copyright
 #          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,
 #          IN PART OR IN WHOLE,
 #          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
 # file    tst_post
-<<<<<<< HEAD
-# date    2020/12/27
-# author  Behrouz NematiPour
+# date   03/17/2022
+# author  Papiya Mandal
 #
+import names 
 
-# NOTE:
-# This test is a demo and is intended to be used as an example on how to call the dialin API within SquishQt.
-
-
-from time import sleep
-from dialin.ui import utils
-from dialin.ui import unittests
-from dialin.ui.hd_simulator import HDSimulator
-
-
-def main():
-    utils.tstStart("demo")
-    startApplication("denaliSquish")
-=======
-# @author  (last)      Papiya Mandal
-# @date    (last)      07-02-2022
-#
-
-import names
-
 from builtins import int as pyInt
 from configuration.config import AUT_NAME
 from dialin.ui import utils
 from dialin.ui.hd_simulator import HDSimulator
 
-
 MSGS_AND_CONDITIONS = { 1: [True, False], 5: [True, False], 2: [True, False],
                         4: [True, False], 8: [True, False], 9: [False, False],
                         3: [True, False], 10: [True, False], 15: [True, False],
@@ -126,27 +103,11 @@
     
     utils.tstStart(__file__)
     startApplication(AUT_NAME)
->>>>>>> origin/diality_initialization_screen
 
-    hd    = HDSimulator()
-
-
     hd.cmd_send_power_on_self_test_version_request()
-<<<<<<< HEAD
-    for i in range(20):
-        hd.cmd_send_hd_post(i, True, False)
-        sleep(0.1)
-    hd.cmd_send_hd_post(0, True, True)
-    hd.cmd_send_hd_operation_mode(4, 0)
-
-    unittests.test_python_version()
-    unittests.test_crc8()
-    unittests.test_can0()
-
-=======
+    
     post_a_message_and_verify_progress_and_completion(MSGS_AND_CONDITIONS)
     utils.waitForGUI(2)
-    
->>>>>>> origin/diality_initialization_screen
+
     utils.tstDone()