:pencil2: Fixed merge conflicts

frontend/src/views/SurveyCompleteView.vue

                 }
             })
         },
+        // Grabs all responses to questions that are NOT aspect questions
         grabResponsesFromProfile(aspectQuestions) {
             const aspectQuestionsKeys = Object.keys(aspectQuestions).map(Number)
             const responses = currentProfile._profile.responses