diff --git a/src/pages.json b/src/pages.json
index a1259033..d3155b84 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -10,7 +10,6 @@
             }
         },
         {
-<<<<<<< HEAD
             "path": "pages/courseDetail/index",
             "style": {
                 "navigationBarTitleText": "课程详情",
@@ -20,8 +19,6 @@
             }
         },
         {
-=======
->>>>>>> f0015d5ea46c4904ce35c5ec4a03028d9ec6d5b4
             "path": "pages/study/index",
             "style": {
                 "navigationBarTitleText": "学习",
@@ -93,8 +90,6 @@
                     "titleNView": false
                 }
             }
-<<<<<<< HEAD
-=======
         },
         {
             "path": "pages/course/index",
@@ -104,7 +99,6 @@
                     "titleNView": false
                 }
             }
->>>>>>> f0015d5ea46c4904ce35c5ec4a03028d9ec6d5b4
         }
     ],
     "tabBar": {