Remove unneeded code. Fix indentation.

Fix merge conflict.

src/layouts/quote/quote.vue

@@ -1,36 +1,45 @@
 
 <template>
-    <Form
-      @submit="onSubmit"
-      @invalid-submit="onInvalidSubmit"
-      ref="theForm"
-      v-slot="{ meta }"
-    >
-      <div class="page-container-grouped-styles">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
-        <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
-        <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-        <div class="fade-on-route-transition sub-container make-tall">
-          <cashOrInsuranceQuestion
-            ref="cashOrInsurance"
-            cmsWidgetName="CashOrInsuranceQuestionWidget"
-            v-model="isInsurance"
-            groupName="CashOrInsuranceQuestion"
-          />
-          <radioServicePackage/>
-          <funnel-footer
-            cmsWidgetName="FunnelFooterWidget"
-            :isForwardActionDisabled="!meta.valid"
-            :isBackButtonHidden=shouldHideBackButton
-            @back-clicked="backButtonAction"
-            @ForwardClicked="forwardButtonAction"
-          />
-        </div>
-        <quoteModal
-          cmsWidgetName="EstimateRainDefenseModal"
-        />
-      </div>
-    </Form>
+  <Form
+  @submit="onSubmit"
+  @invalid-submit="onInvalidSubmit"
+  ref="theForm"
+  v-slot="{ meta }"
+  >
+  <div class="page-container-grouped-styles">
+    <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
+    <vehicleBanner cmsWidgetName="VehicleBannerWidget" :displayGenericVehicleImage=false />
+    <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+    <div class="fade-on-route-transition sub-container make-tall">
+      <buttonQuestion
+      :answers="years"
+      text-position="text-start"
+      questionText="List Button as Radio"
+      groupName="years"
+      />
+      <buttonQuestion
+      questionText="CASH OR INSURANCE"
+      :answers="answersFromCms"
+      groupName="cash-or-insurance"
+      buttonType="listButtonHorizontal"
+      useTextForValue
+      isCashOrInsurance
+      isRequired
+      />
+      <radioServicePackage/>
+      <funnel-footer
+      cmsWidgetName="FunnelFooterWidget"
+      :isForwardActionDisabled="!meta.valid"
+      :isBackButtonHidden=shouldHideBackButton
+      @back-clicked="backButtonAction"
+      @ForwardClicked="forwardButtonAction"
+      />
+    </div>
+    <quoteModal
+    cmsWidgetName="EstimateRainDefenseModal"
+    />
+  </div>
+</Form>
 </template>
 
 <script>
@@ -48,15 +57,24 @@ import { Form } from "vee-validate";
 
 
 export default {
-    name: "quote",
-    async beforeRouteEnter(to, from, next) {
-      // Call APIs
-      const cmsContent = await fetchCmsContentForPage(to.query.fmgPage);
+  name: "quote",
+  async beforeRouteEnter(to, from, next) {
+    // Call APIs
+    const cmsContent = await fetchCmsContentForPage(to.query.fmgPage);
 
-      // Call the "next" function to complete the transition to this page.
-      next((vm) => {
-        vm.setCmsContent(cmsContent);
-      });
+    // Call the "next" function to complete the transition to this page.
+    next((vm) => {
+      vm.setCmsContent(cmsContent);
+    });
+  },
+  methods: {
+    arePagePrerequisitesValid() {
+      return true;
+    }
+  },
+  computed: {
+    years() {
+      return ["2011", "2012"];
     },
     data(){
       return {
@@ -64,29 +82,26 @@ export default {
       }
     },
     methods: {
-        arePagePrerequisitesValid() {
-            return true;
-        }
+      arePagePrerequisitesValid() {
+        return true;
+      }
     },
     computed: {
-        years() {
-            return ["2011", "2012"];
-        },
-        answersFromCms() {
-            return ["Pay on my own", "Pay with insurance"];
-        },
-        selectedChipCountValues: {
+      years() {
+        return ["2011", "2012"];
+      },
+      answersFromCms() {
+        return ["Pay on my own", "Pay with insurance"];
+      },
+      selectedChipCountValues: {
         get: function() {
-            return this.modelValue;
+          return this.modelValue;
         },
         set: function(newValue) {
-            this.$emit("update:modelValue", newValue);
+          this.$emit("update:modelValue", newValue);
         },
-        QuoteRecalImage(){
-          return this.getCmsContent("EstimateRecalModal", "Image");
-        },
-    },
       },
+    },
     components: {
       funnelHeader,
       funnelFooter,
@@ -96,9 +111,7 @@ export default {
       buttonQuestion,
       radioServicePackage,
       quoteModal,
-      cashOrInsuranceQuestion,
-      radioServicePackage,
     },
 
-};
-</script>
+  };
+  </script>