ok

pages/onboarding/index.vue

@@ -9,15 +9,9 @@
       <h6 class="text-center text-muted">Make sure that your headphones are properly connected. </h6>
       <h6 class="text-center text-muted">To use Mindboost, headphones are required. </h6>
     </div>
-<<<<<<< HEAD:pages/onboarding/index.vue
     <div class="row pt-5 text-center">
       <div class="d-flex mx-auto justify-content-center ">
         <div class="checkmark pt-2 d-block d-sm-inline-block px-1">
-=======
-    <div class=" pt-5 text-center">
-      <div class=" ">
-        <nuxt-link to="/onbording/onbording2"  @click.once="increment(50)" class="checkmark pt-2 d-block d-sm-inline-block d-inline-block">
->>>>>>> c2fd5cdf9222ad06828578796322b9ef8ac834d1:pages/onbording/index.vue
           <input type="radio" class="btn-check" name="options-outlined" id="success-outlined1" autocomplete="off">
           <label class="btn pt-4 px-5 checklabel" for="success-outlined1">
             <svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 60 41" fill="none">
@@ -25,7 +19,7 @@
             </svg>
             <p class=" text-center">In-Ear</p>
           </label>
-        </nuxt-link>
+        </div>
 
         <nuxt-link to="/onboarding/onboarding2"  @click.once="increment(50)" class="checkmark px-1 pt-2 d-inline-block">
           <input type="radio" class="btn-check checkmark" name="options-outlined" id="danger-outlined1" autocomplete="off">

pages/onboarding/onboarding2.vue

@@ -9,13 +9,8 @@
           <h6 class="text-center text-muted">What’s that?</h6>
         </div>
         <div class=" pt-5 text-center">
-<<<<<<< HEAD:pages/onboarding/onboarding2.vue
           <div class="d-flex mx-auto justify-content-center ">
             <div class="checkmark pt-2 px-1 d-block d-sm-inline-block d-inline-block">
-=======
-          <div class=" ">
-            <nuxt-link to="/onbording/onbording3"  @click.once="increment(75)"  class="checkmark pt-2 d-block d-sm-inline-block d-inline-block">
->>>>>>> c2fd5cdf9222ad06828578796322b9ef8ac834d1:pages/onbording/onbording2.vue
               <input type="radio" class="btn-check" name="options-outlined" id="success-outlined1" autocomplete="off" >
               <label class="btn pt-4 px-5 checklabel" for="success-outlined1">
                 <svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 60 46" fill="none">
@@ -23,7 +18,7 @@
                 </svg>
                 <p class=" text-center">No</p>
               </label>
-            </nuxt-link>
+            </div>
 
             <nuxt-link to="/onboarding/onboarding3"  @click.once="increment(75)" class="checkmark pt-2 px-1 d-inline-block">
               <input type="radio" class="btn-check checkmark" name="options-outlined" id="danger-outlined1" autocomplete="off">

pages/onboarding/onboarding3.vue

@@ -8,13 +8,8 @@
           <h4 class="text-center fw-bold pt-5">What are your plans for today?</h4>
         </div>
         <div class=" pt-5 text-center">
-<<<<<<< HEAD:pages/onboarding/onboarding3.vue
           <div class=" d-flex mx-auto justify-content-center">
             <div class="checkmark px-1 pt-2 d-block d-sm-inline-block d-inline-block">
-=======
-          <div class=" ">
-            <nuxt-link to="/onbording/onbording4"  @click.once="increment(100)" class="checkmark pt-2 d-block d-sm-inline-block d-inline-block">
->>>>>>> c2fd5cdf9222ad06828578796322b9ef8ac834d1:pages/onbording/onbording3.vue
               <input type="radio" class="btn-check" name="options-outlined" id="success-outlined1" autocomplete="off" >
               <label class="btn pt-4 px-5 checklabel" for="success-outlined1">
                 <svg xmlns="http://www.w3.org/2000/svg" width="60"  viewBox="0 0 51 56" fill="none">
@@ -22,7 +17,7 @@
                 </svg>
                 <p class=" text-center">Creativity</p>
               </label>
-            </nuxt-link>
+            </div>
 
             <nuxt-link to="/onboarding/onboarding4"  @click.once="increment(100)" class="checkmark pt-2 px-1 d-inline-block">
               <input type="radio" class="btn-check checkmark" name="options-outlined" id="danger-outlined1" autocomplete="off">

pages/onboarding/onboarding4.vue

@@ -8,13 +8,8 @@
           <h4 class="text-center fw-bold pt-5">Please choose a soundscape</h4>
         </div>
         <div class="col-12 text-center ">
-<<<<<<< HEAD:pages/onboarding/onboarding4.vue
         <div class="d-flex mx-auto justify-content-center ">
           <div class="checkmark px-1 pt-2 d-block d-sm-inline-block d-inline-block">
-=======
-        <div class=" ">
-          <nuxt-link to="/letsgo" class="checkmark pt-2 d-block d-sm-inline-block d-inline-block">
->>>>>>> c2fd5cdf9222ad06828578796322b9ef8ac834d1:pages/onbording/onbording4.vue
           <input type="radio" class="btn-check" name="options-outlined" id="success-outlined1" autocomplete="off" >
           <label class="btn pt-4 px-5 checklabel" for="success-outlined1">
             <svg xmlns="http://www.w3.org/2000/svg" width="55" height="60" viewBox="0 0 60 46" fill="none">
@@ -22,7 +17,7 @@
             </svg>
             <p class=" text-center">In-Ear</p>
           </label>
-          </nuxt-link>
+          </div>
 
           <nuxt-link to="/letsgo" class="checkmark px-1 pt-2 d-inline-block">
           <input type="radio" class="btn-check checkmark" name="options-outlined" id="danger-outlined1" autocomplete="off">