src/components/design/sidebars/cards/cardVApromo.svelte

@@ -1,12 +1,8 @@
 <script>
 	import { PRICES } from "#lib/constants";
 </script>
-<<<<<<< HEAD:src/components/design/sidebars/cards/cardVApromo.svelte
 	
-<div id ="cardVApromo" 
-	class="	box card">
-=======
->>>>>>> origin/UMBE:src/components/design/sidebars/cards/card-VA-promo.svelte
+<div id ="cardVApromo" class="	box card">
 
 <div id="card-VA-promo" class="	box card bg-white px-6 py-4 mb-5">
 	<div class="grid">
@@ -31,5 +27,7 @@
 	</div>
 </div>
 
+</div>
+
 <style lang="scss">
 </style>

src/pages/index.astro

@@ -1,10 +1,6 @@
 ---
 import Layout from "#layouts/Layout.astro";
-<<<<<<< HEAD
 import ProduktVergleich from "#content/produktVergleich.svelte";
-=======
-import BannerSaeule from "#content/BannerSaeule.svelte";
->>>>>>> origin/UMBE
 
 ---
 
@@ -12,11 +8,7 @@ import BannerSaeule from "#content/BannerSaeule.svelte";
 
 	<h1>Unsere Ausweise im Detail:</h1>
 
-<<<<<<< HEAD
 	<!-- <ProduktVergleich /> -->
-=======
-	<BannerSaeule client:load />
->>>>>>> origin/UMBE
 </Layout>