diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index e2ed35ccd..021539dd6 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -168,9 +168,10 @@ class Cart {
                     if (isset($cartProduct['parent_id']) && $cartItem->parent_id != $parentCartItem->id) {
                         $cartItem = $this->cartItemRepository->create(array_merge($cartProduct, ['cart_id' => $cart->id]));
                     } else {
-                        if ($product->getTypeInstance()->showQuantityBox() === false) {
+                        if ($cartItem->product->getTypeInstance()->showQuantityBox() === false) {
                             return ['warning' => __('shop::app.checkout.cart.integrity.qty_impossible')];
                         }
+
                         $cartItem = $this->cartItemRepository->update($cartProduct, $cartItem->id);
                     }
                 }
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
index 087d37296..6fd9314e3 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
@@ -6,14 +6,23 @@
         {{ __('velocity::app.admin.contents.content.category-slug') }}
     </label>
 
+    @php
+       $pageTarget = isset($locale) ? (old($locale)['page_link'] ?? (isset($content) ? $content->translate($locale)['page_link'] : '')) : '';
+    @endphp
+
     <input
         type="text"
         id="page_link"
         class="control"
-        name="page_link"
+        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') }}
@@ -26,7 +35,7 @@
     </label>
 
     @php
-       $linkTarget = isset($locale) ? (old($locale)['link_target'] ?? $content->translate($locale)['link_target']) : '';
+       $linkTarget = isset($locale) ? (old($locale)['link_target'] ?? (isset($content) ? $content->translate($locale)['link_target'] : '')) : '';
     @endphp
 
     <select
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/edit-product.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/edit-product.blade.php
index ef7ba1096..993e39d8b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/edit-product.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/edit-product.blade.php
@@ -6,7 +6,7 @@
 @push('scripts')
     <script type="text/x-template" id="catalog-product-template">
         <div>
-            <?php $catalogType =  old($locale)['catalog_type'] ?? $content->translate($locale)['catalog_type']; ?>
+            <?php $catalogType =  old($locale)['catalog_type'] ?? (isset($content) ? $content->translate($locale)['catalog_type'] : ''); ?>
 
             <div class="control-group" :class="[errors.has('{{$locale}}[catalog_type]') ? 'has-error' : '']">
                 <label for="catalog_type" class="required">
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php
index 39eb0ad02..53093f14d 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php
@@ -7,6 +7,8 @@
 @section('content')
     <div class="content">
 
+        <?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
+
         <form method="POST" action="" @submit.prevent="onSubmit" enctype="multipart/form-data">
 
             <div class="page-header">
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php
index 95a67938b..f961c64b6 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php
@@ -46,6 +46,7 @@
         <a href="{{ route('customer.session.destroy') }}" class="theme-btn light unset pull-right">
             {{ __('shop::app.header.logout') }}
         </a>
+<<<<<<< HEAD
         
         <span class="account-heading">
             {{ __('shop::app.customer.account.profile.index.title') }}
@@ -58,10 +59,17 @@
         </span>
 
         <div class="horizontal-rule"></div>
+=======
+
+        <h1 class="account-heading">
+            {{ __('shop::app.customer.account.profile.index.title') }}
+        </h1>
+>>>>>>> upstream/master
     </div>
 
     {!! view_render_event('bagisto.shop.customers.account.profile.view.before', ['customer' => $customer]) !!}
 
+<<<<<<< HEAD
     <div class="account-table-content">
         <div class="table">
             <table>
@@ -121,8 +129,39 @@
                         <label for="password" class="required">{{ __('admin::app.users.users.password') }}</label>
                         <input type="password" v-validate="'required|min:6|max:18'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.users.password') }}&quot;"/>
                         <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
-                    </div>
+=======
+        <div class="profile-update-form">
+            <form
+                method="POST"
+                @submit.prevent="onSubmit"
+                class="account-table-content"
+                action="{{ route('customer.profile.edit') }}">
 
+                @csrf
+
+                <div :class="`row ${errors.has('first_name') ? 'has-error' : ''}`">
+                    <label class="col-12 mandatory">
+                        {{ __('shop::app.customer.account.profile.fname') }}
+                    </label>
+
+                    <div class="col-12">
+                        <input value="{{ $customer->first_name }}" name="first_name" type="text" v-validate="'required'" />
+                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-12">
+                        {{ __('shop::app.customer.account.profile.lname') }}
+                    </label>
+
+                    <div class="col-12">
+                        <input value="{{ $customer->last_name }}" name="last_name" type="text" />
+>>>>>>> upstream/master
+                    </div>
+                </div>
+
+<<<<<<< HEAD
                     <div class="page-action">
                         <button type="submit"  class="theme-btn mb20">
                         {{ __('shop::app.customer.account.address.index.delete') }}
@@ -132,6 +171,134 @@
             </modal>
         </form>        
     </div>
+=======
+                <div :class="`row ${errors.has('gender') ? 'has-error' : ''}`">
+                    <label class="col-12 mandatory">
+                        {{ __('shop::app.customer.account.profile.gender') }}
+                    </label>
+
+                    <div class="col-12">
+                        <select
+                            name="gender"
+                            v-validate="'required'"
+                            class="control styled-select"
+                            data-vv-as="&quot;{{ __('shop::app.customer.account.profile.gender') }}&quot;">
+
+                            <option value=""  @if ($customer->gender == "") selected @endif></option>
+                            <option
+                                value="Other"
+                                @if ($customer->gender == "Other")
+                                    selected="selected"
+                                @endif>
+                                {{ __('velocity::app.shop.gender.other') }}
+                            </option>
+
+                            <option
+                                value="Male"
+                                @if ($customer->gender == "Male")
+                                    selected="selected"
+                                @endif>
+                                {{ __('velocity::app.shop.gender.male') }}
+                            </option>
+
+                            <option
+                                value="Female"
+                                @if ($customer->gender == "Female")
+                                    selected="selected"
+                                @endif>
+                                {{ __('velocity::app.shop.gender.female') }}
+                            </option>
+                        </select>
+
+                        <div class="select-icon-container">
+                            <span class="select-icon rango-arrow-down"></span>
+                        </div>
+
+                        <span class="control-error" v-if="errors.has('gender')">@{{ errors.first('gender') }}</span>
+                    </div>
+                </div>
+
+                <div :class="`row ${errors.has('date_of_birth') ? 'has-error' : ''}`">
+                    <label class="col-12">
+                        {{ __('shop::app.customer.account.profile.dob') }}
+                    </label>
+
+                    <div class="col-12">
+                        <input
+                            type="date"
+                            name="date_of_birth"
+                            placeholder="dd/mm/yyyy"
+                            value="{{ old('date_of_birth') ?? $customer->date_of_birth }}"
+                            v-validate="" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.dob') }}&quot;" />
+
+                            <span class="control-error" v-if="errors.has('date_of_birth')">
+                                @{{ errors.first('date_of_birth') }}
+                            </span>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-12 mandatory">
+                        {{ __('shop::app.customer.account.profile.email') }}
+                    </label>
+
+                    <div class="col-12">
+                        <input value="{{ $customer->email }}" name="email" type="text" v-validate="'required'" />
+                        <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-12">
+                        {{ __('velocity::app.shop.general.enter-current-password') }}
+                    </label>
+
+                    <div :class="`col-12 ${errors.has('oldpassword') ? 'has-error' : ''}`">
+                        <input value="" name="oldpassword" type="password" />
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-12">
+                        {{ __('velocity::app.shop.general.new-password') }}
+                    </label>
+
+                    <div :class="`col-12 ${errors.has('password') ? 'has-error' : ''}`">
+                        <input
+                            value=""
+                            name="password"
+                            type="password"
+                            v-validate="'min:6|max:18'" />
+
+                        <span class="control-error" v-if="errors.has('password')">
+                            @{{ errors.first('password') }}
+                        </span>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <label class="col-12">
+                        {{ __('velocity::app.shop.general.confirm-new-password') }}
+                    </label>
+
+                    <div :class="`col-12 ${errors.has('password_confirmation') ? 'has-error' : ''}`">
+                        <input value="" name="password_confirmation" type="password"
+                        v-validate="'min:6|confirmed:password'" data-vv-as="confirm password" />
+
+                        <span class="control-error" v-if="errors.has('password_confirmation')">
+                            @{{ errors.first('password_confirmation') }}
+                        </span>
+                    </div>
+                </div>
+
+                <button
+                    type="submit"
+                    class="theme-btn mb20">
+                    {{ __('velocity::app.shop.general.update') }}
+                </button>
+            </form>
+        </div>
+>>>>>>> upstream/master
 
     {!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
 @endsection
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/home/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/home/index.blade.php
index d12f5a5fc..c068c215f 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/home/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/home/index.blade.php
@@ -40,6 +40,15 @@
     @endif
 @endsection
 
+@push('css')
+    <style type="text/css">
+        .product-price span:first-child, .product-price span:last-child {
+            font-size: 18px;
+            font-weight: 600;
+        }
+    </style>
+@endpush
+
 @section('content-wrapper')
     @include('shop::home.slider')
 @endsection
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php
index 7901ef55a..bd1fa7285 100755
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/index.blade.php
@@ -14,6 +14,11 @@
 
 @push('css')
     <style type="text/css">
+        .product-price span:first-child, .product-price span:last-child {
+            font-size: 18px;
+            font-weight: 600;
+        }
+        
         @media only screen and (max-width: 992px) {
             .main-content-wrapper .vc-header {
                 box-shadow: unset;
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
index 9bb81aa33..d9a3e52ce 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
@@ -8,6 +8,14 @@
         .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
 
@@ -50,10 +58,19 @@
                         @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', [
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php
index 70478922b..8b012e830 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php
@@ -160,10 +160,6 @@
 
                 methods: {
                     toggleLayeredNavigation: function ({event, actionType}) {
-                        // this.$root.navContainer = true;
-                        // this.$root.responsiveSidebarTemplate = `<div slot="sidebar-body">
-                        //     Hello World
-                        // </div>`;
                         this.layeredNavigation = !this.layeredNavigation;
                     }
                 }