diff --git a/main.py b/main.py
index d3d075b..e984607 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
 import os
-os.system('python Function-21373339.py')
-=======
-# main.py 文件的内容修改为
-import os
-os.system('python Function-21373328.py')
->>>>>>> origin/Student-21373328
+os.system('python Function-21373330.py')
+os.system('echo Function-21373330')
\ No newline at end of file