diff --git a/index.html b/index.html
index 3b90a3f..351eaae 100644
--- a/index.html
+++ b/index.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <!doctype html>
 <html>
 <head>
@@ -13,6 +12,3 @@
 <script type="text/javascript" src="js/wyrian.js"></script>
 </body>
 </html>
-=======
-blbabnlazblk
->>>>>>> 8c9ce0771b3b31e23fad325f9fbc388eeacf8e5d
