diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 195cb662..a9bdb997 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -573,7 +573,6 @@ $bezier: cubic-bezier(0.75, 0, 0.25, 1);
       display: none;
     }
   }
-<<<<<<< HEAD
 	summary::after {
     content: '▶';
 		font-size: 1.8rem;
@@ -583,9 +582,6 @@ $bezier: cubic-bezier(0.75, 0, 0.25, 1);
 		transform: rotate(180deg);
 
 	}
-=======
-
->>>>>>> 61101723 (feat: poder cambiar el nivel de summary)
   &[open] {
 		& > summary {
       .hide-when-open {
@@ -597,12 +593,9 @@ $bezier: cubic-bezier(0.75, 0, 0.25, 1);
       }
 		}
 	}
-<<<<<<< HEAD
 } 
 
 
 hr {
   border-bottom: 1px solid #dee2e6;
-=======
->>>>>>> 61101723 (feat: poder cambiar el nivel de summary)
 }
diff --git a/app/views/layouts/_details.haml b/app/views/layouts/_details.haml
index 94203400..a679541a 100644
--- a/app/views/layouts/_details.haml
+++ b/app/views/layouts/_details.haml
@@ -1,10 +1,5 @@
 -# Detail Cola de Moderación
 
-<<<<<<< HEAD
-%details.details.py-2
-  %summary
-    %h3.py-2= summary
-=======
   @param :id [String] El ID opcional sirve para mantener el historial de
   cuál estaba abierto y recuperarlo al cargar la página
   @param :summary [String] El resumen
@@ -17,5 +12,4 @@
     %span= summary
     %span.hide-when-open &#x25B6;
     %span.show-when-open &#x25BC;
->>>>>>> 61101723 (feat: poder cambiar el nivel de summary)
   = yield