diff --git a/app.json b/app.json
index 9dfcf50..64d7f6e 100644
--- a/app.json
+++ b/app.json
@@ -1,12 +1,8 @@
 {
   "pages": [
-<<<<<<< Updated upstream
-    "pages/center/center",
-    "pages/book/book",
-=======
-    "pages/broadcastList/broadcastList",
->>>>>>> Stashed changes
     "pages/index/index",
+    "pages/center/center",
+    "pages/broadcastList/broadcastList",
     "pages/orderDetail/orderDetail",
     "pages/myVenueOrder/myVenueOrder",
     "pages/book/book",