diff --git a/Function-21371404.py b/Function-21371404.py
new file mode 100644
index 0000000..a6f88a2
--- /dev/null
+++ b/Function-21371404.py
@@ -0,0 +1 @@
+print('My Student_ID is 21371404')
diff --git a/main.py b/main.py
index cc1f29d..044e0cd 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,8 @@
+#<<<<<<< HEAD
 # main.py 文件的内容修改为
+#import os
+#os.system('python Function-20374188.py')
+#=======
 import os
-os.system('python Function-20374188.py')
\ No newline at end of file
+os.system('python Funtion-21371404.py')
+#>>>>>>> Student-21371404