diff --git a/source/tests/pt/test_make_stat_input.py b/source/tests/pt/test_make_stat_input.py
index c546bb1017..96009ef7cf 100644
--- a/source/tests/pt/test_make_stat_input.py
+++ b/source/tests/pt/test_make_stat_input.py
@@ -87,13 +87,8 @@ def test_make_stat_input(self):
         )
 
     def test_make_stat_input_nocomplete(self):
-<<<<<<< HEAD
         #missing element:13,31,37
         #only one frame would be count
-=======
-        # missing element：13,31,37
-        # only one frame would be count
->>>>>>> 26205d74c44201c56d39241b75e26ae381fcf67f
 
         lst = make_stat_input(
             datasets=self.datasets,
@@ -146,6 +141,5 @@ def test_bias(self):
                         f"relative difference {rel_diff:.2%} is too large",
                     )
 
-
 if __name__ == "__main__":
     unittest.main()