diff --git a/README.md b/README.md
index b436c42..d3bba5d 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,7 @@
-<<<<<<< HEAD
 # local_alert
 
 本地告警页面
 =======
-# alarm_managerment
-
 ## Project Setup
 
 ```sh
@@ -263,4 +260,3 @@ export default router;
 
 #### Layout.vue
 
->>>>>>> master