[Saved.]

packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php

@@ -16,13 +16,8 @@
         class="control"
         name="{{$locale}}[page_link]"
         v-validate="'required|max:150'"
-<<<<<<< HEAD
-        value="{{ isset($locale) ? (old($locale)['page_link'] ?? $content->translate($locale)['page_link']) : '' }}"
-        data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.category-slug') }}&quot;" />
-=======
         value="{{ $pageTarget }}"
         data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.page-link') }}&quot;" />
->>>>>>> upstream/master
 
     <span class="control-error" v-if="errors.has('page_link')">
         @{{ errors.first('page_link') }}

packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php

@@ -8,14 +8,11 @@
         .list-card .wishlist-icon i {
             padding-left: 10px;
         }
-<<<<<<< HEAD
-=======
         
         .product-price span:first-child, .product-price span:last-child {
             font-size: 18px;
             font-weight: 600;
         }
->>>>>>> upstream/master
     </style>
 @endpush
 
@@ -58,19 +55,12 @@
                         @include ('shop::products.price', ['product' => $product])
                     </div>
 
-<<<<<<< HEAD
-                    <div class="product-rating">
-                        <star-ratings ratings="{{ $avgRatings }}"></star-ratings>
-                        <span>{{ __('velocity::app.products.ratings', ['totalRatings' => $totalReviews ]) }}</span>
-                    </div>
-=======
                     @if( $totalReviews )
                         <div class="product-rating">
                             <star-ratings ratings="{{ $avgRatings }}"></star-ratings>
                             <span>{{ $totalReviews }} Ratings</span>
                         </div>
                     @endif
->>>>>>> upstream/master
 
                     <div class="cart-wish-wrap mt5">
                         @include ('shop::products.add-to-cart', [