diff --git a/index.html b/index.html
index 3fd16b2..60a82c6 100644
--- a/index.html
+++ b/index.html
@@ -1,43 +1,28 @@
 <!DOCTYPE html>
 <html lang="de">
 <head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Social Cooking Wireframe</title>
-<<<<<<< HEAD:index.html
-  <link rel="stylesheet" href="css/landingpage.css" />
-</head>
-=======
-  <link rel="stylesheet" href="stylesheet.css" />  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css" integrity="sha512-dU7ZrF1pFq5kVnPzlV9+04YhARzNjCX5Q5P1shgMpuN4s5I8mI8QD4981h7kYtV7sSgNldR0z5pZW5bS2ZpY3Q==" crossorigin="anonymous" referrerpolicy="no-referrer" /></head>
->>>>>>> feature/landing-page:landing-page.html
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Social Cooking Wireframe</title>
+    <link rel="stylesheet" href="css/landingpage.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css" integrity="sha512-dU7ZrF1pFq5kVnPzlV9+04YhARzNjCX5Q5P1shgMpuN4s5I8mI8QD4981h7kYtV7sSgNldR0z5pZW5bS2ZpY3Q==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+  </head>
 <body>
   <div class="page-wrapper">
     <header class="header">
-<<<<<<< HEAD
       <div class="header__brand">Invité</div>
       <div class="header__actions">
         <a class="nav__link" href="#">Event finden</a>
         <button class="btn btn--outline" type="button">Login</button>
       </div>
     </header>
-=======
-  <div class="header__brand">LOGO</div>
-  
-  <div class="header__actions">
-    <nav class="nav">
-      <a class="nav__link btn btn--outline" href="event_overview.html">Event finden</a>
-    </nav>
-    <a class="btn btn--outline" href="login.html">Login</a>
-  </div>
-</header>
->>>>>>> 434d0f34b927873523861ef29092aabcd3573ade
 
     <main class="main-content">
       <section class="hero">
         <div class="hero__left">
           <h1 class="hero__title">Zu Tisch mit Fremden – bereit für die nächste kulinarische Begegnung?</h1>
           <p class="hero__description">Dein Ort um neue Leute kennen zu lernen! Erstelle eigene Events und lade Gäste zu dir nach Hause ein.</p>
-          <a class="btn btn--primary" href="signup.html">Anmelden</a>
+          <button class="btn btn--primary" type="button">Anmelden</button>
         </div>
 
         <div class="hero__right">
