Update 5dnode3mnodeStop.py

tests/system-test/6-cluster/5dnode3mnodeStop.py

@@ -253,11 +253,7 @@ class TDTestCase:
         # fisr add three mnodes;
         tdLog.info("fisr add three mnodes and check mnode status")
         tdSql.execute("create mnode on dnode 2")
-<<<<<<< HEAD
         clusterComCheck.checkMnodeStatus(2)
-=======
-        time.sleep(10)
->>>>>>> e571567ec2ae0c7668ccf1b8aaaf949fc84bb44c
         tdSql.execute("create mnode on dnode 3")
         clusterComCheck.checkMnodeStatus(3)
 
@@ -307,4 +303,4 @@ class TDTestCase:
         tdLog.success(f"{__file__} successfully executed")
 
 tdCases.addLinux(__file__, TDTestCase())
-tdCases.addWindows(__file__, TDTestCase())
\ No newline at end of file
+tdCases.addWindows(__file__, TDTestCase())