diff --git a/packageC/pages/presell/cart/cart2_pre.wxml b/packageC/pages/presell/cart/cart2_pre.wxml
index 72686ef..bf27c36 100644
--- a/packageC/pages/presell/cart/cart2_pre.wxml
+++ b/packageC/pages/presell/cart/cart2_pre.wxml
@@ -123,10 +123,6 @@
             </view>
           </view>
         </view>
-<<<<<<< HEAD
-
-=======
->>>>>>> 33b100b85758e70b0abfa89ba1e4bf25e025e03d
                 
                 <view class="coupon-mes flex-vertical">
                     <view>留言</view>