:pencil2: Fixed merge issues

frontend/src/views/OnboardingView.vue

@@ -29,7 +29,12 @@ main.view--onboarding
             p(v-if='currentStep != 0') You have completed: {{ currentStep }} / {{ survey?.steps?.length }} survey steps
 
     article(v-else)
+<<<<<<< HEAD
         SurveyCompleteView(:surveySteps='survey.steps' :responses='responses')
+=======
+        // TODO: format answers and surveySteps on created based off of existing responses
+        SurveyCompleteView(:answers='answered' :surveySteps='survey.steps' :responses='responses')
+>>>>>>> f9ccc4c (:memo: Small note on how to proceed with SurveyCompleteView)
 </template>
 
 <script>