diff --git a/README.md b/README.md
index 56a92f5..1ffbe1a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 # 学生成绩管理系统
 
+<<<<<<< HEAD
 ## 
-.....
\ No newline at end of file
+.....
+=======