diff --git a/Function-21371363.py b/Function-21371363.py
index 3c3d0fb..2684544 100644
--- a/Function-21371363.py
+++ b/Function-21371363.py
@@ -1,7 +1 @@
-<<<<<<< HEAD
-# Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371363')
-print('My Name is 陈子恒')
-=======
-print('My Student_ID is 21371363')
->>>>>>> Student-21371363