diff --git a/packages/default-theme/pages/_.vue b/packages/default-theme/pages/_.vue
index fc6861ec5..9e4ea6cd5 100644
--- a/packages/default-theme/pages/_.vue
+++ b/packages/default-theme/pages/_.vue
@@ -1,10 +1,6 @@
 <template>
   <div>
-<<<<<<< HEAD
     <component :is="getComponent" :cms-page="cmsPage"/>
-=======
-    <component :is="getComponent" :cms-page="cmsPage" :product="product"/>
->>>>>>> demo
   </div>
 </template>
 <script>