diff --git a/src/y4f/Shared/Footer.razor b/src/y4f/Shared/Footer.razor
index ddf59b0..656dc31 100644
--- a/src/y4f/Shared/Footer.razor
+++ b/src/y4f/Shared/Footer.razor
@@ -16,17 +16,10 @@
 
 <footer>
     <div class="container">
-<<<<<<< HEAD:Shared/Footer.razor
-    <a href="">Kontakt</a> |
-    <a href="Impressum">Impressum</a> |
-    <a href="">Datenschutzerklärung</a> |
-    <a href="">Cookies</a>
-=======
     <a href="Kontakt">Kontakt</a> |
-    <a href="">Impressum</a> |
+    <a href="Impressum">Impressum</a> |
     <a href="datenschutzerklärung">Datenschutzerklärung</a> |
     <a href="cookies">Cookies</a>
->>>>>>> dev:src/y4f/Shared/Footer.razor
     </div>
 </footer>
 @code {