diff --git a/Function-21371058.py b/Function-21371058.py
new file mode 100644
index 0000000..5a40be7
--- /dev/null
+++ b/Function-21371058.py
@@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371058')
\ No newline at end of file
diff --git a/Function-21371489.py b/Function-21371489.py
new file mode 100644
index 0000000..158cbaf
--- /dev/null
+++ b/Function-21371489.py
@@ -0,0 +1 @@
+print('My Student_ID is 21371489')
\ No newline at end of file
diff --git a/Student-21371483.py b/Student-21371483.py
new file mode 100644
index 0000000..4096b7a
--- /dev/null
+++ b/Student-21371483.py
@@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371483')
diff --git a/main.py b/main.py
index da4d816..cf12255 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,6 @@
 import os
-os.system('python Function-21371112.py')
\ No newline at end of file
+<<<<<<< HEAD
+os.system('python Function-21371112.py')
+=======
+os.system('python Function-21371489.py')
+>>>>>>> c2ed1daf4fc61d992ba340efac67c0354369a18b
diff --git a/test.txt b/test.txt
new file mode 100644
index 0000000..30d74d2
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+test
\ No newline at end of file