diff --git a/Function-21371181.py b/Function-21371181.py
index 15a2047..23bd2e7 100644
--- a/Function-21371181.py
+++ b/Function-21371181.py
@@ -1 +1,2 @@
-print('My Student_ID is 21371181')
\ No newline at end of file
+print('My Student_ID is 学号')
+print('My Name is 姓名')
\ No newline at end of file
diff --git a/main.py b/main.py
index 5a9cf72..8d38f55 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,9 @@
+<<<<<<< HEAD
+import os
+os.system('python Function-21371181.py')
+=======
 # main.py 文件的内容修改为
 import os
 os.system('python Function-21373007.py')
 
+>>>>>>> 29c15aacebc90fb3cf460fe2b5e218fc40206a51