diff --git a/.gitignore b/.gitignore
index 1e166d8..4d809a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .DS_Store
 node_modules
 /dist
@@ -22,7 +21,7 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-=======
+
 # ---> Vue
 # gitignore template for Vue.js projects
 #
@@ -34,4 +33,3 @@ docs/_book
 # TODO: where does this rule come from?
 test/
 
->>>>>>> cc73829d1ccba87b56bfd777b66614e1d855efb7
diff --git a/README.md b/README.md
index 54ddd69..730393e 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,12 @@
-<<<<<<< HEAD
-# jlntv-board-vue
-
-## Project setup
-```
-yarn install
-```
-
-### Compiles and hot-reloads for development
-```
-yarn serve
-```
-
-### Compiles and minifies for production
-```
-yarn build
-```
-
-### Lints and fixes files
-```
-yarn lint
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
-=======
+<!--
+ * @Author: BlackTeay <i@iteay.top>
+ * @Date: 2021-03-20 15:30:44
+ * @LastEditors: BlackTeay <i@iteay.top>
+ * @LastEditTime: 2021-03-20 16:07:57
+ * @Descripttion: 
+ * @FilePath: \vue-with-vant\README.md
+ * Copyright 2021 Visual Studio, JLNTV
+-->
 # vue-with-vant
 
 带有vant的Vue基础工程
->>>>>>> cc73829d1ccba87b56bfd777b66614e1d855efb7