diff --git a/app.json b/app.json
index c7d04b0..e13693d 100644
--- a/app.json
+++ b/app.json
@@ -77,13 +77,9 @@
     "van-checkbox": "@vant/weapp/checkbox/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index",
     "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
-<<<<<<< HEAD
-    "van-dropdown-item": "@vant/weapp/dropdown-item/index"
-    
-=======
     "van-dropdown-item": "@vant/weapp/dropdown-item/index",
     "van-popup": "@vant/weapp/popup/index"
->>>>>>> 29a010892133f077fb8f534c4b4fccd20f4355e3
+
   }
   
 }
\ No newline at end of file
diff --git a/pages/index/Rankdetail/Rankdetail.wxml b/pages/index/Rankdetail/Rankdetail.wxml
index 5d4a22e..455c7de 100644
--- a/pages/index/Rankdetail/Rankdetail.wxml
+++ b/pages/index/Rankdetail/Rankdetail.wxml
@@ -63,11 +63,9 @@
             </view>
             <view style="width: 30%;">
                 <view class="volume">{{item.volume}}</view>
-<<<<<<< HEAD
-                <view class="trend" >
-=======
+
+
                 <view class="trend" bindtap="onclick">
->>>>>>> 29a010892133f077fb8f534c4b4fccd20f4355e3
                     <van-icon size="16px" name="arrow" />
                     <view>销量趋势</view>
                 </view>