diff --git a/index.html b/index.html
index 3c19176..8751e10 100644
--- a/index.html
+++ b/index.html
@@ -22,9 +22,6 @@
             <li>Projects</li>
             <li>Contact</li>
         </ul>
-<<<<<<< HEAD
-    </nav>
-=======
     </nav>-->
 
     <main>
@@ -43,6 +40,5 @@
             </p>
         </article>
     </main>
->>>>>>> c8000e41cc15a76985524dc31fcd32ba8e56f6f8
 </body>
 </html>