diff --git a/resources/js/Pages/Settings/Edit.vue b/resources/js/Pages/Settings/Edit.vue
index 541e8044..84d524ba 100644
--- a/resources/js/Pages/Settings/Edit.vue
+++ b/resources/js/Pages/Settings/Edit.vue
@@ -5,21 +5,21 @@ import Footer from '@/Components/LayoutParts/Footer.vue';
 import DeleteUserForm from './Partials/DeleteUserForm.vue';
 import UpdatePasswordForm from './Partials/UpdatePasswordForm.vue';
 import UpdateProfileInformationForm from './Partials/UpdateProfileInformationForm.vue';
-<<<<<<< HEAD
+
 import { Head, usePage } from '@inertiajs/vue3';
-=======
+
 import { Head } from '@inertiajs/vue3';
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
 import { route, current } from 'momentum-trail'
 
 defineProps({
     mustVerifyEmail: Boolean,
     status: String,
     categories: Array,
-<<<<<<< HEAD
+
     themes: Array,
-=======
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
+
 });
 
 function showModal(modalId: string): void {
@@ -31,7 +31,7 @@ function showModal(modalId: string): void {
 </script>
 
 <template>
-<<<<<<< HEAD
+
     <Navbar />
     <Sidebar>
         <div class="modal" id="email-modal">
@@ -41,7 +41,7 @@ function showModal(modalId: string): void {
                         <div class="text-lg fw-semibold">Change Email</div>
                         <button @click="showModal('email-modal')" class="btn-circle" data-toggle-modal="#email-modal"
                             style="margin-right: -10px">
-=======
+
    <Navbar/>
 	<Sidebar>
         <div class="modal" id="email-modal">
@@ -57,7 +57,7 @@ function showModal(modalId: string): void {
                             data-toggle-modal="#email-modal"
                             style="margin-right: -10px"
                         >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                             <i class="fas fa-times"></i>
                         </button>
                     </div>
@@ -67,42 +67,42 @@ function showModal(modalId: string): void {
                         <div class="text-xs fw-bold text-muted text-uppercase">
                             New Email
                         </div>
-<<<<<<< HEAD
+
                         <input type="text" class="form" placeholder="New Email..." />
-=======
+
                         <input
                             type="text"
                             class="form"
                             placeholder="New Email..."
                         />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                     </div>
                     <div class="mb-2">
                         <div class="text-xs fw-bold text-muted text-uppercase">
                             Password
                         </div>
-<<<<<<< HEAD
+
                         <input type="password" class="form" placeholder="Password..." />
-=======
+
                         <input
                             type="password"
                             class="form"
                             placeholder="Password..."
                         />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                     </div>
                     <div class="text-xs text-muted fw-semibold">
                         After changing your email address, a confirmation email
                         will be sent to your inbox to confirm your identity.
                     </div>
                 </div>
-<<<<<<< HEAD
+
                 <div class="flex-wrap gap-2 flex-container justify-content-end section-borderless">
                     <button class="btn btn-secondary" @click="showModal('email-modal')">
                         Cancel
                     </button>
                     <input type="submit" class="btn btn-success" value="Change Email" />
-=======
+
                 <div
                     class="flex-wrap gap-2 flex-container justify-content-end section-borderless"
                 >
@@ -117,19 +117,19 @@ function showModal(modalId: string): void {
                         class="btn btn-success"
                         value="Change Email"
                     />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                 </div>
             </div>
         </div>
         <div class="modal" id="username-modal">
             <div class="modal-card modal-card-body modal-card-sm">
                 <div class="section-borderless">
-<<<<<<< HEAD
+
                     <div class="gap-2 align-middle flex-container align-justify">
                         <div class="text-lg fw-semibold">Change Username</div>
                         <button @click="showModal('username-modal')" class="btn-circle" data-toggle-modal="#username-modal"
                             style="margin-right: -10px">
-=======
+
                     <div
                         class="gap-2 align-middle flex-container align-justify"
                     >
@@ -140,7 +140,7 @@ function showModal(modalId: string): void {
                             data-toggle-modal="#username-modal"
                             style="margin-right: -10px"
                         >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                             <i class="fas fa-times"></i>
                         </button>
                     </div>
@@ -150,15 +150,15 @@ function showModal(modalId: string): void {
                         <div class="text-xs fw-bold text-danger text-uppercase">
                             Username
                         </div>
-<<<<<<< HEAD
+
                         <input type="text" class="form" placeholder="New Username..." />
-=======
+
                         <input
                             type="text"
                             class="form"
                             placeholder="New Username..."
                         />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                         <div class="text-xs text-danger fw-semibold">
                             This username is already taken. Try @Nabrious123
                             instead.
@@ -168,7 +168,7 @@ function showModal(modalId: string): void {
                         <div class="text-xs fw-bold text-muted text-uppercase">
                             Password
                         </div>
-<<<<<<< HEAD
+
                         <input type="password" class="form" placeholder="Password..." />
                     </div>
                     <div class="text-xs text-muted fw-semibold">
@@ -181,7 +181,7 @@ function showModal(modalId: string): void {
                         Cancel
                     </button>
                     <input type="submit" class="btn btn-success" value="Change Username" />
-=======
+
                         <input
                             type="password"
                             class="form"
@@ -209,20 +209,20 @@ function showModal(modalId: string): void {
                         class="btn btn-success"
                         value="Change Username"
                     />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                 </div>
             </div>
         </div>
         <div class="modal" id="displayname-modal">
             <div class="modal-card modal-card-body modal-card-sm">
                 <div class="section-borderless">
-<<<<<<< HEAD
+
                     <div class="gap-2 align-middle flex-container align-justify">
                         <div class="text-lg fw-semibold">
                             Change Display Name
                         </div>
                         <button class="btn-circle" @click="showModal('displayname-modal')" style="margin-right: -10px">
-=======
+
                     <div
                         class="gap-2 align-middle flex-container align-justify"
                     >
@@ -234,7 +234,7 @@ function showModal(modalId: string): void {
                             @click="showModal('displayname-modal')"
                             style="margin-right: -10px"
                         >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                             <i class="fas fa-times"></i>
                         </button>
                     </div>
@@ -243,13 +243,13 @@ function showModal(modalId: string): void {
                     <div class="text-xs fw-bold text-muted text-uppercase">
                         New Display Name
                     </div>
-<<<<<<< HEAD
+
                     <input type="text" class="mb-2 form" placeholder="New Display Name..." />
                     <div class="text-xs fw-bold text-muted text-uppercase">
                         Password
                     </div>
                     <input type="password" class="mb-2 form" placeholder="Password..." />
-=======
+
                     <input
                         type="text"
                         class="mb-2 form"
@@ -263,19 +263,19 @@ function showModal(modalId: string): void {
                         class="mb-2 form"
                         placeholder="Password..."
                     />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                     <div class="text-xs text-muted fw-semibold">
                         Changing your your display name is free but can only be
                         done once every two weeks.
                     </div>
                 </div>
-<<<<<<< HEAD
+
                 <div class="flex-wrap gap-2 flex-container justify-content-end section-borderless">
                     <button class="btn btn-secondary" @click="showModal('displayname-modal')">
                         Cancel
                     </button>
                     <input type="submit" class="btn btn-success" value="Change Display Name" />
-=======
+
                 <div
                     class="flex-wrap gap-2 flex-container justify-content-end section-borderless"
                 >
@@ -290,12 +290,12 @@ function showModal(modalId: string): void {
                         class="btn btn-success"
                         value="Change Display Name"
                     />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                 </div>
             </div>
         </div>
 
-<<<<<<< HEAD
+
         <div class="cell medium-3">
             <div class="mb-2 text-xl fw-semibold">Account Settings</div>
             <ul class="tabs flex-dir-column">
@@ -311,7 +311,7 @@ function showModal(modalId: string): void {
 
             <div v-for="category in categories" :key="category">
                 <div v-if="category === 'general'">
-=======
+
                 <div class="cell medium-3">
                     <div class="mb-2 text-xl fw-semibold">Account Settings</div>
                     <ul class="tabs flex-dir-column">
@@ -324,7 +324,7 @@ function showModal(modalId: string): void {
                 </div>
                 <div class="cell medium-8" v-for="category in categories" :key="category">
 		  <div v-if="category === 'general'">
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                     <div class="mb-1 text-xl fw-semibold">General</div>
                     <div class="section-borderless">
                         <div class="card card-body">
@@ -335,7 +335,7 @@ function showModal(modalId: string): void {
                                 <div class="grid-x grid-margin-x">
                                     <div class="mb-3 cell medium-6">
                                         <div
-<<<<<<< HEAD
+
                                             class="gap-2 align-middle card card-body card-inner flex-container align-justify h-100">
                                             <div class="min-w-0">
                                                 <div class="text-xs text-truncate fw-bold text-muted text-uppercase">
@@ -346,7 +346,7 @@ function showModal(modalId: string): void {
                                                 </div>
                                             </div>
                                             <DeleteUserForm />
-=======
+
                                             class="gap-2 align-middle card card-body card-inner flex-container align-justify h-100"
                                         >
                                             <div class="min-w-0">
@@ -362,12 +362,12 @@ function showModal(modalId: string): void {
                                                 </div>
                                             </div>
                                             <DeleteUserForm/>
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                         </div>
                                     </div>
                                     <div class="mb-3 cell medium-6">
                                         <div
-<<<<<<< HEAD
+
                                             class="gap-2 align-middle card card-body card-inner flex-container align-justify">
                                             <div class="min-w-0">
                                                 <div class="text-xs text-truncate fw-bold text-muted text-uppercase">
@@ -378,7 +378,7 @@ function showModal(modalId: string): void {
                                                 </div>
                                             </div>
                                             <button class="btn btn-info btn-circle" @click="showModal('username-modal')">
-=======
+
                                             class="gap-2 align-middle card card-body card-inner flex-container align-justify"
                                         >
                                             <div class="min-w-0">
@@ -397,14 +397,14 @@ function showModal(modalId: string): void {
                                                 class="btn btn-info btn-circle"
                                                 @click="showModal('username-modal')"
                                             >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                                 <i class="fas fa-pencil"></i>
                                             </button>
                                         </div>
                                     </div>
                                     <div class="mb-3 cell medium-6">
                                         <div
-<<<<<<< HEAD
+
                                             class="gap-2 align-middle card card-body card-inner flex-container align-justify">
                                             <div class="min-w-0">
                                                 <div class="text-xs text-truncate fw-bold text-muted text-uppercase">
@@ -415,7 +415,7 @@ function showModal(modalId: string): void {
                                                 </div>
                                             </div>
                                             <button class="btn btn-info btn-circle" @click="showModal('displayname-modal')">
-=======
+
                                             class="gap-2 align-middle card card-body card-inner flex-container align-justify"
                                         >
                                             <div class="min-w-0">
@@ -434,14 +434,14 @@ function showModal(modalId: string): void {
                                                 class="btn btn-info btn-circle"
                                                 @click="showModal('displayname-modal')"
                                             >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                                 <i class="fas fa-pencil"></i>
                                             </button>
                                         </div>
                                     </div>
                                     <div class="mb-3 cell medium-6">
                                         <div
-<<<<<<< HEAD
+
                                             class="gap-2 align-middle card card-body card-inner flex-container align-justify">
                                             <div class="min-w-0">
                                                 <div class="text-xs text-truncate fw-bold text-muted text-uppercase">
@@ -454,7 +454,7 @@ function showModal(modalId: string): void {
                                                 </div>
                                             </div>
                                             <button class="btn btn-info btn-circle" @click="showModal('email-modal')">
-=======
+
                                             class="gap-2 align-middle card card-body card-inner flex-container align-justify"
                                         >
                                             <div class="min-w-0">
@@ -481,14 +481,14 @@ function showModal(modalId: string): void {
                                                 class="btn btn-info btn-circle"
                                                 @click="showModal('email-modal')"
                                             >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                                 <i class="fas fa-pencil"></i>
                                             </button>
                                         </div>
                                     </div>
                                     <div class="mb-3 cell medium-6">
                                         <div
-<<<<<<< HEAD
+
                                             class="gap-2 align-middle card card-body card-inner flex-container align-justify">
                                             <div class="min-w-0">
                                                 <div class="text-xs text-truncate fw-bold text-muted text-uppercase">
@@ -501,7 +501,7 @@ function showModal(modalId: string): void {
                                                     If you want to change your
                                                     date of birth,
                                                     <a href="#">contact support</a>.
-=======
+
                                             class="gap-2 align-middle card card-body card-inner flex-container align-justify"
                                         >
                                             <div class="min-w-0">
@@ -523,13 +523,13 @@ function showModal(modalId: string): void {
                                                     <a href="#"
                                                         >contact support</a
                                                     >.
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-<<<<<<< HEAD
+
                                 <div class="text-xs fw-bold text-muted text-uppercase">
                                     About You
                                 </div>
@@ -549,7 +549,7 @@ function showModal(modalId: string): void {
                                     <input type="text" class="form form-sm btn-sm"
                                         :value="$page.props.auth.user.Signature" />
                                     <input type="submit" class="btn btn-success btn-sm" value="Update" />
-=======
+
                                 <div
                                     class="text-xs fw-bold text-muted text-uppercase"
                                 >
@@ -588,7 +588,7 @@ function showModal(modalId: string): void {
                                         class="btn btn-success btn-sm"
                                         value="Update"
                                     />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                 </div>
                             </div>
                         </div>
@@ -598,7 +598,7 @@ function showModal(modalId: string): void {
                             <div class="mb-2 text-xl fw-semibold">
                                 Website Theme
                             </div>
-<<<<<<< HEAD
+
 
                             <div id="theme-switcher-container" class="grid-x grid-margin-x grid-padding-y">
                                 <div class="cell large-6" v-for="(theme, index) in themes" :key="index">
@@ -613,7 +613,7 @@ function showModal(modalId: string): void {
                                                     {{ theme.name }} Theme
                                                 </div>
                                                 <div class="selection-circle flex-child-grow show-for-small hide-for-large"></div>
-=======
+
                             <div  id="theme-switcher-container" class="grid-x grid-margin-x grid-padding-y">
                                 <div class="cell large-6">
                                     <div
@@ -798,13 +798,13 @@ function showModal(modalId: string): void {
                                                 <div
                                                     class="selection-circle flex-child-grow show-for-small hide-for-large"
                                                 ></div>
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-<<<<<<< HEAD
+
                             
 
                         </div>
@@ -812,13 +812,13 @@ function showModal(modalId: string): void {
                 </div>
                 <div v-if="category === 'account'">
                     <div class="text-xl fw-semibold mb-1">
-=======
+
                         </div>
                     </div>
 		</div>
                 <div v-if="category === 'account'">
 		   <div class="text-xl fw-semibold mb-1">
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                         Security & Privacy
                     </div>
                     <div class="section-borderless">
@@ -828,7 +828,7 @@ function showModal(modalId: string): void {
                                 <div class="cell medium-12">
                                     <div class="card card-inner card-body">
                                         <div class="mb-2">
-<<<<<<< HEAD
+
                                             <div class="text-xl fw-semibold mb-2">
                                                 Change Password
                                             </div>
@@ -852,7 +852,7 @@ function showModal(modalId: string): void {
                                                 </div>
                                                 <input type="password" class="form form-has-section-color"
                                                     placeholder="Current Password..." />
-=======
+
                                             <div
                                                 class="text-xl fw-semibold mb-2"
                                             >
@@ -893,7 +893,7 @@ function showModal(modalId: string): void {
                                                     class="form form-has-section-color"
                                                     placeholder="Current Password..."
                                                 />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                             </div>
                                         </div>
                                         <button class="btn btn-success">
@@ -912,12 +912,12 @@ function showModal(modalId: string): void {
                                     Privacy
                                 </div>
                                 <div class="mb-2">
-<<<<<<< HEAD
+
                                     <div class="text-xs fw-bold text-muted text-uppercase">
                                         Who Can Follow Me
                                     </div>
                                     <select class="form form-select form-has-section-color">
-=======
+
                                     <div
                                         class="text-xs fw-bold text-muted text-uppercase"
                                     >
@@ -926,18 +926,18 @@ function showModal(modalId: string): void {
                                     <select
                                         class="form form-select form-has-section-color"
                                     >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                         <option value="1">Everyone</option>
                                         <option value="2">No One</option>
                                     </select>
                                 </div>
                                 <div class="mb-2">
-<<<<<<< HEAD
+
                                     <div class="text-xs fw-bold text-muted text-uppercase">
                                         Who Can See My Posts?
                                     </div>
                                     <select class="form form-select form-has-section-color">
-=======
+
                                     <div
                                         class="text-xs fw-bold text-muted text-uppercase"
                                     >
@@ -946,7 +946,7 @@ function showModal(modalId: string): void {
                                     <select
                                         class="form form-select form-has-section-color"
                                     >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                         <option value="1">Everyone</option>
                                         <option value="2">
                                             Followers Only
@@ -954,12 +954,12 @@ function showModal(modalId: string): void {
                                     </select>
                                 </div>
                                 <div class="mb-2">
-<<<<<<< HEAD
+
                                     <div class="text-xs fw-bold text-muted text-uppercase">
                                         Who Can Send Me Messages
                                     </div>
                                     <select class="form form-select form-has-section-color">
-=======
+
                                     <div
                                         class="text-xs fw-bold text-muted text-uppercase"
                                     >
@@ -968,7 +968,7 @@ function showModal(modalId: string): void {
                                     <select
                                         class="form form-select form-has-section-color"
                                     >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                         <option value="1">Everyone</option>
                                         <option value="2">
                                             Followers Only
@@ -977,12 +977,12 @@ function showModal(modalId: string): void {
                                     </select>
                                 </div>
                                 <div class="mb-2">
-<<<<<<< HEAD
+
                                     <div class="text-xs fw-bold text-muted text-uppercase">
                                         Who Can Send Me Trade Requests
                                     </div>
                                     <select class="form form-select form-has-section-color">
-=======
+
                                     <div
                                         class="text-xs fw-bold text-muted text-uppercase"
                                     >
@@ -991,7 +991,7 @@ function showModal(modalId: string): void {
                                     <select
                                         class="form form-select form-has-section-color"
                                     >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                         <option value="1">Everyone</option>
                                         <option value="2">
                                             Followers Only
@@ -1007,14 +1007,14 @@ function showModal(modalId: string): void {
                                 <div class="text-xl fw-semibold mb-2">
                                     Blocked Players
                                 </div>
-<<<<<<< HEAD
+
                                 <div class="text-xs fw-bold text-muted text-uppercase">
                                     Player Username
                                 </div>
                                 <div class="flex-container gap-2 mb-2">
                                     <input type="text" class="form form-has-section-color"
                                         placeholder="Player Username..." />
-=======
+
                                 <div
                                     class="text-xs fw-bold text-muted text-uppercase"
                                 >
@@ -1026,13 +1026,13 @@ function showModal(modalId: string): void {
                                         class="form form-has-section-color"
                                         placeholder="Player Username..."
                                     />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                     <button class="btn btn-danger">
                                         Block
                                     </button>
                                 </div>
                                 <div class="card card-body">
-<<<<<<< HEAD
+
                                     <div class="flex-container flex-dir-column text-center gap-3">
                                         <i class="fas fa-user-slash text-5xl text-muted"></i>
                                         <div style="line-height: 16px">
@@ -1040,7 +1040,7 @@ function showModal(modalId: string): void {
                                                 No Blocked Players
                                             </div>
                                             <div class="text-xs text-muted fw-semibold">
-=======
+
                                     <div
                                         class="flex-container flex-dir-column text-center gap-3"
                                     >
@@ -1056,7 +1056,7 @@ function showModal(modalId: string): void {
                                             <div
                                                 class="text-xs text-muted fw-semibold"
                                             >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                                 Yahoo! You have not blocked any
                                                 players.
                                             </div>
@@ -1121,14 +1121,14 @@ function showModal(modalId: string): void {
                                 </div>
                             </div>
                         </div>
-<<<<<<< HEAD
+
                     </div>
                 </div>
                 <div v-if="category === 'billing'">
                     <div class="flex-container align-middle align-justify mb-2">
                         <div class="text-xl fw-semibold">Billing</div>
                         <a href="#" class="btn btn-upgrade btn-sm"><i class="fas fa-rocket-launch me-2"></i>Upgrade</a>
-=======
+
 		    </div>
 		</div>
 		<div v-if="category === 'billing'">
@@ -1137,19 +1137,19 @@ function showModal(modalId: string): void {
                         <a href="#" class="btn btn-upgrade btn-sm"
                             ><i class="fas fa-rocket-launch me-2"></i>Upgrade</a
                         >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                     </div>
                     <div class="card card-body mb-3">
                         <div class="text-xl fw-semibold mb-2">
                             Active Membership
                         </div>
                         <div class="card card-inner card-body">
-<<<<<<< HEAD
+
                             <div class="flex-container flex-dir-column text-center gap-3">
                                 <i class="fas fa-rocket-launch text-5xl text-muted"></i>
                                 <div style="line-height: 16px">
                                     <div class="fw-bold text-xs text-muted text-uppercase">
-=======
+
                             <div
                                 class="flex-container flex-dir-column text-center gap-3"
                             >
@@ -1160,7 +1160,7 @@ function showModal(modalId: string): void {
                                     <div
                                         class="fw-bold text-xs text-muted text-uppercase"
                                     >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                         No Active Membership
                                     </div>
                                     <div class="text-xs text-muted fw-semibold">
@@ -1281,12 +1281,12 @@ function showModal(modalId: string): void {
             -->
 
                         <div class="card card-inner card-body">
-<<<<<<< HEAD
+
                             <div class="flex-container flex-dir-column text-center gap-3">
                                 <i class="fas fa-envelope-open-text text-5xl text-muted"></i>
                                 <div style="line-height: 16px">
                                     <div class="fw-bold text-xs text-muted text-uppercase">
-=======
+
                             <div
                                 class="flex-container flex-dir-column text-center gap-3"
                             >
@@ -1297,7 +1297,7 @@ function showModal(modalId: string): void {
                                     <div
                                         class="fw-bold text-xs text-muted text-uppercase"
                                     >
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
                                         No Previous Purchases
                                     </div>
                                     <div class="text-xs text-muted fw-semibold">
@@ -1307,23 +1307,23 @@ function showModal(modalId: string): void {
                             </div>
                         </div>
                     </div>
-<<<<<<< HEAD
+
                 </div>
             </div>
         </div>
     </Sidebar>
     <Footer />
-=======
+
 		</div>
 	</div>
     </Sidebar>
     <Footer/>
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
 </template>
 
 <script lang="ts">
 export default {
-<<<<<<< HEAD
+
     data() {
         return {
             activeTheme: '',
@@ -1388,7 +1388,7 @@ export default {
             }
         },
     },
-=======
+
   data() {
     return {
       activeTheme: '',
@@ -1470,6 +1470,6 @@ export default {
       }
     },
   },
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
+
 };
 </script>