diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b69c727..9b5564f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 <!--index.wxml-->
 <view class="container">
     <view class="header"> 
@@ -22,11 +20,17 @@
 =======
 =======
 >>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
+=======
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
 <view>
   <view>
     <image src="../../utils/img/a.jpeg"></image>
   </view>
 <<<<<<< HEAD
+<<<<<<< HEAD
+</view>
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
+=======
 </view>
 >>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
 =======
diff --git a/project.config.json b/project.config.json
index 0b46df5..502b099 100644
--- a/project.config.json
+++ b/project.config.json
@@ -14,6 +14,7 @@
 	},
 	"compileType": "miniprogram",
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 	"libVersion": "2.0.4",
 	"appid": "wxae4f3cb3357e0b55",
@@ -21,6 +22,10 @@
 	"libVersion": "2.9.4",
 	"appid": "wx5766b7aac7c938b3",
 >>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
+=======
+	"libVersion": "2.9.4",
+	"appid": "wx5766b7aac7c938b3",
+>>>>>>> c5f771a59727db7ba1c64d41699c7724f4ed2d1c
 =======
 	"libVersion": "2.9.4",
 	"appid": "wx5766b7aac7c938b3",