diff --git a/pages.json b/pages.json
index b2db5f9..bd77429 100644
--- a/pages.json
+++ b/pages.json
@@ -20,15 +20,9 @@
 			"path": "pages/user/index",
 			"name": "User",
 			"auth": true,
-<<<<<<< HEAD
-			"style": {
-				"navigationBarTitleText": "节点中心",
-				"navigationStyle": "custom"
-=======
 			"style": {
 				"navigationBarTitleText": "节点中心",
-				"navigationStyle":"custom"
->>>>>>> 7ee3ddee638ee97b563a70fde8a6fe769589f72c
+				"navigationStyle":"custom"
 			}
 		}, {
 			"path": "pages/user/code",