CSR-116 Resolve merge conflict.

src/layouts/componentTest/componentTest.vue

@@ -128,6 +128,16 @@
         />
       </div>
     </div>
+    <div class="my-3">
+      <div class="select-car">
+        <div class="select-car-form">
+          <radioQuestion
+            questionText="What year is your vehicle?"
+            :answers="this.years"
+          />
+        </div>
+      </div>
+    </div>
   </div>
 </template>