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 f961c64b6..ae5cc1b72 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,90 +46,14 @@
         <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') }}
-        </span>
-
-        <span class="account-action">
-            <a href="{{ route('customer.profile.edit') }}" class="theme-btn light unset pull-right">
-                {{ __('shop::app.customer.account.profile.index.edit') }}
-            </a>
-        </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>
-                <tbody>
-                    {!! view_render_event(
-                    'bagisto.shop.customers.account.profile.view.table.before', ['customer' => $customer])
-                    !!}
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.profile.fname') }}</td>
-                        <td>{{ $customer->first_name }}</td>
-                    </tr>
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.profile.lname') }}</td>
-                        <td>{{ $customer->last_name }}</td>
-                    </tr>
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.profile.gender') }}</td>
-                        <td>{{ $customer->gender ?? '-' }}</td>
-                    </tr>
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.profile.dob') }}</td>
-                        <td>{{ $customer->date_of_birth ?? '-' }}</td>
-                    </tr>
-
-                    <tr>
-                        <td>{{ __('shop::app.customer.account.profile.email') }}</td>
-                        <td>{{ $customer->email }}</td>
-                    </tr>
-
-                    {!! view_render_event(
-                    'bagisto.shop.customers.account.profile.view.table.after', ['customer' => $customer])
-                    !!}
-                </tbody>
-            </table>
-        </div>
-
-        <button
-            type="submit"
-            class="theme-btn mb20" @click="showModal('deleteProfile')" >
-            {{ __('shop::app.customer.account.address.index.delete') }}
-        </button>
-
-        <form method="POST" action="{{ route('customer.profile.destroy') }}" @submit.prevent="onSubmit">
-            @csrf
-
-            <modal id="deleteProfile" :is-open="modalIds.deleteProfile">
-                <h3 slot="header">{{ __('shop::app.customer.account.address.index.enter-password') }}
-                </h3>
-                <i class="rango-close"></i>
-
-                <div slot="body">
-                    <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
-                        <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 class="profile-update-form">
             <form
                 method="POST"
@@ -157,21 +81,9 @@
 
                     <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') }}
-                        </button>
-                    </div>
-                </div>
-            </modal>
-        </form>        
-    </div>
-=======
                 <div :class="`row ${errors.has('gender') ? 'has-error' : ''}`">
                     <label class="col-12 mandatory">
                         {{ __('shop::app.customer.account.profile.gender') }}
@@ -298,7 +210,6 @@
                 </button>
             </form>
         </div>
->>>>>>> upstream/master
 
     {!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
 @endsection
\ No newline at end of file