diff --git a/equipo-humano/index.html b/equipo-humano/index.html
index a01b18e..52f1e2e 100644
--- a/equipo-humano/index.html
+++ b/equipo-humano/index.html
@@ -421,13 +421,10 @@ font-size: 1.7rem;
 				                        <div class="isotope-item col-sm-6 col-lg-4">
                             <article class="doctor-common doctor-grid doctor-grid-one hentry">
 								            <figure>
-<<<<<<< HEAD
                 <a href="dr-victor-hernandez-gombau/index.html" title="Dr. Victor Hernandez Gombau" aria-labelledby="doctor-card-victor-hernandez">
 					<img width="500" height="618" src="../wp-content/uploads/2014/05/Victor-Hernandez-500x618.jpg" class="attachment-doctor-grid-thumb size-doctor-grid-thumb wp-post-image" alt="" decoding="async" />                </a>
-=======
                 <a href="dr-victor-hernandez-gombau/index.html" title="Dr. Victor Hernandez Gombau">
 					<img width="500" height="618" src="../wp-content/uploads/2014/05/Victor-Hernandez-500x618.jpg" class="attachment-doctor-grid-thumb size-doctor-grid-thumb wp-post-image" alt="Dr. Victor Hernandez Gombau" decoding="async" />                </a>
->>>>>>> master
             </figure>
 			                                <div class="entry-content">
                                     <h3 class="entry-title" id="doctor-card-victor-hernandez">
@@ -439,13 +436,10 @@ font-size: 1.7rem;
 						                        <div class="isotope-item col-sm-6 col-lg-4">
                             <article class="doctor-common doctor-grid doctor-grid-one hentry">
 								            <figure>
-<<<<<<< HEAD
                 <a href="dna-sandra-gomez-trillo/index.html" title="Dña. Sandra Gómez Trillo" aria-labelledby="doctor-card-sandra-gomez">
 					<img width="585" height="618" src="../wp-content/uploads/2014/05/sandra-gomez-585x618.jpg" class="attachment-doctor-grid-thumb size-doctor-grid-thumb wp-post-image" alt="" decoding="async" />                </a>
-=======
                 <a href="dna-sandra-gomez-trillo/index.html" title="Dña. Sandra Gómez Trillo">
 					<img width="585" height="618" src="../wp-content/uploads/2014/05/sandra-gomez-585x618.jpg" class="attachment-doctor-grid-thumb size-doctor-grid-thumb wp-post-image" alt="Dña. Sandra Gómez Trillo" decoding="async" />                </a>
->>>>>>> master
             </figure>
 			                                <div class="entry-content">
                                     <h3 class="entry-title" id="doctor-card-sandra-gomez">
@@ -457,13 +451,10 @@ font-size: 1.7rem;
 						                        <div class="isotope-item col-sm-6 col-lg-4">
                             <article class="doctor-common doctor-grid doctor-grid-one hentry">
 								            <figure>
-<<<<<<< HEAD
                 <a href="dna-elena-ayllon-perez/index.html" title="Dña. Elena Ayllón Perez" aria-labelledby="doctor-card-elena-ayllon">
 					<img width="585" height="618" src="../wp-content/uploads/2014/05/elena-perez-585x618.jpg" class="attachment-doctor-grid-thumb size-doctor-grid-thumb wp-post-image" alt="" decoding="async" />                </a>
-=======
                 <a href="dna-elena-ayllon-perez/index.html" title="Dña. Elena Ayllón Perez">
 					<img width="585" height="618" src="../wp-content/uploads/2014/05/elena-perez-585x618.jpg" class="attachment-doctor-grid-thumb size-doctor-grid-thumb wp-post-image" alt="Dña. Elena Ayllón Perez" decoding="async" />                </a>
->>>>>>> master
             </figure>
 			                                <div class="entry-content">
                                     <h3 class="entry-title" id="doctor-card-elena-ayllon">
@@ -475,13 +466,10 @@ font-size: 1.7rem;
 						                        <div class="isotope-item col-sm-6 col-lg-4">
                             <article class="doctor-common doctor-grid doctor-grid-one hentry">
 								            <figure>
-<<<<<<< HEAD
                 <a href="d-ramon-sanchez-parra-meseguer/index.html" title="D. Ramon Sanchez-Parra Meseguer" aria-labelledby="doctor-card-ramon-sanchez">
 					<img width="251" height="258" src="../wp-content/uploads/2014/05/ramon-sanchez-parra.png" class="attachment-doctor-grid-thumb size-doctor-grid-thumb wp-post-image" alt="" decoding="async" />                </a>
-=======
                 <a href="d-ramon-sanchez-parra-meseguer/index.html" title="D. Ramon Sanchez-Parra Meseguer">
 					<img width="251" height="258" src="../wp-content/uploads/2014/05/ramon-sanchez-parra.png" class="attachment-doctor-grid-thumb size-doctor-grid-thumb wp-post-image" alt="D. Ramon Sanchez-Parra Meseguer" decoding="async" />                </a>
->>>>>>> master
             </figure>
 			                                <div class="entry-content">
                                     <h3 class="entry-title" id="doctor-card-ramon-sanchez">
@@ -493,13 +481,10 @@ font-size: 1.7rem;
 						                        <div class="isotope-item col-sm-6 col-lg-4">
                             <article class="doctor-common doctor-grid doctor-grid-one hentry">
 								            <figure>
-<<<<<<< HEAD
                 <a href="d-javier-navarro-sanchez/index.html" title="D. Javier Navarro Sanchez" aria-labelledby="doctor-card-javier-navarro">
 					<img width="585" height="618" src="../wp-content/uploads/2014/05/elena-perez-585x618.jpg" class="attachment-doctor-grid-thumb size-doctor-grid-thumb wp-post-image" alt="" decoding="async" />                </a>
-=======
                 <a href="d-javier-navarro-sanchez/index.html" title="D. Javier Navarro Sanchez">
 					<img width="585" height="618" src="../wp-content/uploads/2014/05/elena-perez-585x618.jpg" class="attachment-doctor-grid-thumb size-doctor-grid-thumb wp-post-image" alt="Dña. Elena Ayllón Perez" decoding="async" />                </a>
->>>>>>> master
             </figure>
 			                                <div class="entry-content">
                                     <h3 class="entry-title" id="doctor-card-javier-navarro">