diff --git a/pages.json b/pages.json
index f766857d..79d6e47e 100644
--- a/pages.json
+++ b/pages.json
@@ -111,8 +111,6 @@
 		            "titleNView" : false //禁用原生导航栏
 		        }
 		    }
-<<<<<<< HEAD
-=======
 		},
 		{
 		    "path" : "pages/me/vlog",
@@ -121,7 +119,6 @@
 		            "titleNView" : false //禁用原生导航栏
 		        }
 		    }
->>>>>>> c54a5f1b1facd9cb72935a34c87d845e48157c03
 		},
 		{
 		    "path" : "pages/me/me",
@@ -130,11 +127,7 @@
 		            "titleNView" : false //禁用原生导航栏
 		        }
 		    }
-<<<<<<< HEAD
 		},
-=======
-		},
->>>>>>> c54a5f1b1facd9cb72935a34c87d845e48157c03
 		{
 		    "path" : "pages/me/myBackImg",
 		    "style" : {
@@ -155,12 +148,8 @@
 		    "path" : "pages/me/myInfo",
 		    "style" : {
 		        "navigationBarTitleText" : "修改个人资料",
-<<<<<<< HEAD
-		        "navigationBarBackgroundColor" : "#181b27"
-=======
 		        "navigationBarBackgroundColor" : "#181b27",
 				"navigationBarTextStyle": "white"
->>>>>>> c54a5f1b1facd9cb72935a34c87d845e48157c03
 		    }
 		},
 		{
@@ -325,8 +314,6 @@
 		        "navigationBarTextStyle" : "white",
 		        "navigationBarBackgroundColor" : "#181b27"
 		    }
-<<<<<<< HEAD
-=======
 		},
 		{
 		    "path" : "pages/me/chooseDistrict",
@@ -335,7 +322,6 @@
 		        "navigationBarTextStyle" : "white",
 		        "navigationBarBackgroundColor" : "#181b27"
 		    }
->>>>>>> c54a5f1b1facd9cb72935a34c87d845e48157c03
 		},
 		// {
 		//     "path" : "pages/me/settings",
@@ -360,7 +346,6 @@
 		        "navigationBarTextStyle" : "white",
 		        "navigationBarBackgroundColor" : "#181b27"
 		    }
-<<<<<<< HEAD
 		},
 		{
 		    "path" : "pages/me/chooseDistrict",
@@ -370,11 +355,6 @@
 		        "navigationBarBackgroundColor" : "#181b27"
 		    }
 		}
-=======
-		}
-
->>>>>>> c54a5f1b1facd9cb72935a34c87d845e48157c03
-
 	],
 	"subPackages": [