diff --git a/public_html/index.html b/public_html/index.html
index 36c4f66..be9cc35 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <html lang="en">
 	<head>
 		<title>My tilde.club page</title>
@@ -39,7 +38,6 @@
 	<!-- Tildeverse Banner code begin -->
 <div style="text-align: center;">
     <object data="https://banner.tildeverse.org/work.php?ID=deepend" type="text/html" width="500" height="80" style="overflow:hidden; wid></div>
->>>>>>> 73e394580d7db2fe1b93be20cc4a44d2c68d5345
 <!-- Tildeverse Banner code end -->
 </body>
 </html>
