diff --git a/index.html b/index.html
index d426548..2e9fa9d 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,8 @@
         <p>Hola Mundo</p>
     </div>
     <div class="lorem">
-        <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Aperiam culpa consequuntur numquam architecto, amet at dolorem hic, laborum vel quibusdam non. Doloremque beatae mollitia esse officia quam, quod blanditiis ut.</p>
+        <!--RamaConflicto-->
+        <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Este cambio esta hecho en la ramaConflicto, amet at dolorem hic, laborum vel quibusdam non. Doloremque beatae mollitia esse officia quam, quod blanditiis ut.</p>
     </div>
 </body>
 </html>