diff --git a/index.html b/index.html
index 72f318e..0b347b3 100644
--- a/index.html
+++ b/index.html
@@ -80,7 +80,7 @@
 <header>
   <h2>Versionamiento de código con GitHub</h2>
 </header>
-<<<<<<< HEAD
+
 <div id="body">
  <section>
   <nav>
@@ -98,11 +98,11 @@ <h1>Contenido</h1>
  </section>
 </div> 
 
-=======
+
 
 <footer>
   <p><a href="https://periferiaitgroup.com/" target="_blank" style="color:cornsilk">Periferia IT Group 2020</a></p>
 </footer> 
->>>>>>> feature/footer
+
 </body>
 </html>