Fix conflicts

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

@@ -121,4 +121,10 @@ export default {
     },
   },
 };
-</script>
+</script>
+
+<style scoped>
+  .tft_section {
+    margin: auto;
+  }
+</style>

src/components/marketing/sections/team-sections/with_large_images.vue

@@ -238,9 +238,6 @@
 <script>
 export default {
   props: ["id", "farmingProcess", "cultivationProcess", "main", "sections"],
-  mounted() {
-    console.log(this.sections);
-  },
   methods: {
     img(image) {
       if (!image) return "";