diff --git a/Function-21371363.py b/Function-21371363.py
index 3efa6d0..3c3d0fb 100644
--- a/Function-21371363.py
+++ b/Function-21371363.py
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371363')
 print('My Name is 陈子恒')
+=======
+print('My Student_ID is 21371363')
+>>>>>>> Student-21371363
diff --git a/Function-21373138.py b/Function-21373138.py
deleted file mode 100644
index 71ca176..0000000
--- a/Function-21373138.py
+++ /dev/null
@@ -1 +0,0 @@
-print('My Student_ID is 21373138')
\ No newline at end of file