diff --git a/app.json b/app.json
index 9acb075..cda5787 100644
--- a/app.json
+++ b/app.json
@@ -61,14 +61,11 @@
       "name": "associationNew",
       "pages": [
         "pages/associationlist/associationlist",
-<<<<<<< HEAD
         "pages/community/community",
         "pages/gMembersList/gMembersList",
-        "pages/gOfficialsList/gOfficialsList"
-=======
+        "pages/gOfficialsList/gOfficialsList",
         "pages/talklist/talklist",
         "pages/eventlist/eventlist"
->>>>>>> 8cb094475e355feb09b2c52a944da0015316e0df
       ]
     },
     {