diff --git a/src/app/modules/info-formas-pago/info-formas-pago.component.html b/src/app/modules/info-formas-pago/info-formas-pago.component.html
index 94286d9..02295b9 100644
--- a/src/app/modules/info-formas-pago/info-formas-pago.component.html
+++ b/src/app/modules/info-formas-pago/info-formas-pago.component.html
@@ -11,12 +11,8 @@
   </div>
   <div class="h-85">
     <div class="row h-auto mt-6 mx-0 justify-content-center text-center">
-<<<<<<< HEAD
       <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-end border
                   border-secondary rounded reduce-card-1">
-=======
-      <div class="col-7 col-xl-4 p-5 m-5 h-auto align-self-end border border-secondary rounded">
->>>>>>> 7004c1df495d5ac2e703f7ff659d1d8c3b384953
         <img
           draggable="false"
           ondragstart="return false;"