diff --git a/tests/pytest/pytest_1.sh b/tests/pytest/pytest_1.sh
index bb7dc8a3e39bd6c6cc8d39d4e8b0b10233e573c8..79815cb6c61d271851511cc0544bb0cbeee597b0 100755
--- a/tests/pytest/pytest_1.sh
+++ b/tests/pytest/pytest_1.sh
@@ -230,13 +230,7 @@ python3 test.py -f tools/lowaTest.py
 python3 test.py -f tools/taosdemoTest2.py
 
 # subscribe
-<<<<<<< HEAD
 python3 test.py -f subscribe/singlemeter.py
-#python3 test.py -f subscribe/stability.py 
+#python3 test.py -f subscribe/stability.py  
 python3 test.py -f subscribe/supertable.py
-=======
-#python3 test.py -f subscribe/singlemeter.py
-#python3 test.py -f subscribe/stability.py
-#python3 test.py -f subscribe/supertable.py
->>>>>>> develop