:bug: fixing some missed conflicts

frontend/src/views/OnboardingView.vue

@@ -1,6 +1,5 @@
 <template lang="pug">
 main.view--onboarding
-<<<<<<< HEAD
     article(
         style='display: flex; flex-direction: column; align-items: center'
         v-if='survey'
@@ -14,22 +13,6 @@ main.view--onboarding
                 @update-answers='updateAnswers'
                 v-if='step && currentStep == i'
             )
-=======
-    article(style='display: flex; flex-direction: column; align-items: center')
-        component(
-            :aspectQuestions='onboardingStep.component == "Aspects" ? aspectQuestions : null'
-            :currentStep='currentStep'
-            :is='onboardingStep.component'
-            @go-to-step='goToStep'
-            @handle-submit='onboardingStep.component == "Aspects" ? onSubmit : null'
-        )
-        //- form(@submit.prevent="onSubmit").questionnaire
-        //-     QuestionResponse(v-for="question in questions" :question="question" @updated="onUpdate")
-        //-     w-button(type="submit")
-        //-         w-icon.mr1 wi-check
-        //-         | SUBMIT ANSWERS
-    //- MainNav
->>>>>>> ae00929 (:sparkles: radio button colors in place)
 </template>
 
 <script>