diff --git a/index.html b/index.html
index f4a1b08..8287719 100644
--- a/index.html
+++ b/index.html
@@ -1,3 +1,5 @@
+<<<<<<< HEAD
+=======
 <!DOCTYPE html>
 <!--[if lt IE 8 ]><html class="no-js ie ie7" lang="en"> <![endif]-->
 <!--[if IE 8 ]><html class="no-js ie ie8" lang="en"> <![endif]-->
@@ -449,3 +451,4 @@
 </body>
 
 </html>
+>>>>>>> 0f28386bbab7b52ee21294ea5585484affea8891
