diff --git a/gallery/index.html b/gallery/index.html
index c20810b..42b5445 100755
--- a/gallery/index.html
+++ b/gallery/index.html
@@ -11,11 +11,8 @@
 <body>
 	<nav>
 		<a href="../index.html" id="logo"><img src="../logo.svg" alt="Logotype"></a>
-<<<<<<< HEAD
 		<button class="nav-toggle" title="Open menu">
-=======
 		<button class="nav-toggle">
->>>>>>> c27a4029688d84a604259109737c953b92088855
     		<span class="bar-top"></span>
     		<span class="bar-mid"></span>
     		<span class="bar-bot"></span>
@@ -63,11 +60,8 @@
 			</ul></li>
 			<li><a href="">Telegram</a></li>
 		</ul>
-<<<<<<< HEAD
 		<a href="#top" id="totop" title="Go to top"><i></i></a>
-=======
 		<a href="#top" id="totop"><i></i></a>
->>>>>>> c27a4029688d84a604259109737c953b92088855
 	</footer>
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"></script>
 	<script type="text/javascript" src="../main.js"></script>
