Fix conflicts

src/components/custom/VideoPanel.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="video_bg lg:py-20 lg:flex lg:justify-center flex flex-col">
+  <div class="lg:py-20 lg:flex lg:justify-center flex flex-col">
     <div class="lg:flex lg:rounded-lg lg:px-40">
       <div class="lg:w-1/2">
         <div class="aspect-w-16 aspect-h-9">

src/components/custom/sections/CallToAction.vue

@@ -43,7 +43,8 @@
     </div>
 
     <!-- home -->
-    <div class="w-full max-w-7xl mx-auto mt-10 p-16" v-else-if="id == 'home'">
+
+    <div class="w-full max-w-7xl mx-auto mt-10 px-16" v-else-if="id == 'home'">
       <h2
         v-if="cta.title"
         class="text-3xl mb-2 uppercase leading-tight font-semibold font-heading"

src/components/marketing/sections/blog-sections/3_column_cards.vue

@@ -8,12 +8,12 @@
     <div class="relative max-w-7xl mx-auto">
       <div class="text-center">
         <h2
-          class="text-3xl leading-9 tracking-tight font-extrabold text-gray-900 sm:text-4xl sm:leading-10"
+          class="text-4xl leading-tight mb-6 font-bold font-heading uppercase sm:text-4xl sm:leading-10"
         >
           {{ main.title }}
         </h2>
         <div
-          class="mt-3 max-w-2xl mx-auto text-xl leading-7 text-gray-600 sm:mt-4"
+          class="mt-3 max-w-2xl mx-auto text-gray-700 sm:mt-4"
           v-html="main.content"
         ></div>
       </div>

src/components/marketing/sections/cta-sections/BrandPanel.vue

@@ -77,7 +77,7 @@
         >
           <div class="lg:self-center">
             <h2
-              class="text-3xl py-10 leading-9 font-extrabold text-black sm:leading-10"
+              class="text-4xl leading-tight mb-6 font-bold font-heading uppercase"
             >
               <span class="block">{{ brand.title }}</span>
               <span class="block" v-if="brand.subtitle">{{
@@ -94,7 +94,7 @@
         </div>
         <div class="relative pb-3/5 -mt-6 md:pb-1/2">
           <g-image
-            class="absolute brandpanel inset-0 w-full h-full transform translate-x-0 translate-y-6 rounded-md object-fill object-left-top sm:translate-x-0 lg:translate-y-20"
+            class="absolute brandpanel inset-0 w-full h-full transform rounded-md object-fill"
             :src="image"
             :alt="brand.title"
           />