diff --git a/.gitignore b/.gitignore
index 403adbc..1e166d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 .DS_Store
 node_modules
 /dist
@@ -21,3 +22,16 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+=======
+# ---> Vue
+# gitignore template for Vue.js projects
+#
+# Recommended template: Node.gitignore
+
+# TODO: where does this rule come from?
+docs/_book
+
+# TODO: where does this rule come from?
+test/
+
+>>>>>>> cc73829d1ccba87b56bfd777b66614e1d855efb7
diff --git a/README.md b/README.md
index 97c1969..54ddd69 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # jlntv-board-vue
 
 ## Project setup
@@ -22,3 +23,8 @@ yarn lint
 
 ### Customize configuration
 See [Configuration Reference](https://cli.vuejs.org/config/).
+=======
+# vue-with-vant
+
+带有vant的Vue基础工程
+>>>>>>> cc73829d1ccba87b56bfd777b66614e1d855efb7