diff --git a/Function-21373439.py b/Function-21373439.py
index 14247ed..bb8d16c 100644
--- a/Function-21373439.py
+++ b/Function-21373439.py
@@ -1,13 +1,3 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21373439')
 print('My Name is 邹可心')
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7ed96b1b75b614f3321d28387cb7564a5200ca5b
-=======
-
-
->>>>>>> 7ed96b1b75b614f3321d28387cb7564a5200ca5b