:bug: fixing another missed conflicts

frontend/src/components/onboarding/Location.vue

@@ -1,17 +1,11 @@
 <template lang="pug">
-<<<<<<< HEAD
-.location
+w-card.location.w-flex.column
     h3 Location
     p {{ question }}
     DynamicTagList(:placeholder='"location"' :tags='locations')
-    w-button.ma1.grow(@click='handleSubmit') NEXT
-=======
-w-card.w-flex.column
-    h3 Location
-    p Where would you like to select your candidates from?
-    w-button.next-btn(@click="this.$emit('go-to-step', currentStep + 1)") NEXT
->>>>>>> 59a1766 (:sparkles: onboarding styles added all the way to the questionnaire #TODO style questionResponse.vue)
+    w-button.next-btn(@click='handleSubmit') NEXT
 </template>
+
 <script>
 import DynamicTagList from '../DynamicTagList.vue'
 export default {