diff --git a/README.md b/README.md
index c854f84..7fb1a45 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
 # 学生成绩管理系统
 
-## 项目简介
 
+## 
+.....
 
+<<<<<<< HEAD
 
 jj
-ok
\ No newline at end of file
+ok
+=
+>>>>>>> 2589a5f37ae74b9dc0f5175e87668b8ba7df602c