diff --git a/.gitignore b/.gitignore
index fcdc89c..6e8c46e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Ignorar archivos de configuración de IDEs
 .venv
 venv
@@ -9,3 +10,13 @@ venv
 # ¡Pero no ignores el archivo .gitkeep!
 !/static/uploads/.gitkeep
 !/cache/.gitkeep
+=======
+.venv
+venv
+
+/cache/
+!/cache/.gitkeep
+
+/static/uploads/
+!/static/uploads/.gitkeep
+>>>>>>> 94e4367c31b015af0d4c0e4325ec73836c63754e
diff --git a/cache/.gitkeep b/cache/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/forms_py/__pycache__/cls_change_pswd.cpython-312.pyc b/forms_py/__pycache__/cls_change_pswd.cpython-312.pyc
index d6904c4..fb4a3fc 100644
Binary files a/forms_py/__pycache__/cls_change_pswd.cpython-312.pyc and b/forms_py/__pycache__/cls_change_pswd.cpython-312.pyc differ
diff --git a/forms_py/__pycache__/cls_db.cpython-312.pyc b/forms_py/__pycache__/cls_db.cpython-312.pyc
index a4d2716..578826c 100644
Binary files a/forms_py/__pycache__/cls_db.cpython-312.pyc and b/forms_py/__pycache__/cls_db.cpython-312.pyc differ
diff --git a/forms_py/__pycache__/cls_db_usr.cpython-312.pyc b/forms_py/__pycache__/cls_db_usr.cpython-312.pyc
index 7b1f1c9..b31f445 100644
Binary files a/forms_py/__pycache__/cls_db_usr.cpython-312.pyc and b/forms_py/__pycache__/cls_db_usr.cpython-312.pyc differ
diff --git a/forms_py/__pycache__/cls_form_add_usr.cpython-312.pyc b/forms_py/__pycache__/cls_form_add_usr.cpython-312.pyc
index eee2463..9801df8 100644
Binary files a/forms_py/__pycache__/cls_form_add_usr.cpython-312.pyc and b/forms_py/__pycache__/cls_form_add_usr.cpython-312.pyc differ
diff --git a/forms_py/__pycache__/cls_form_carousel.cpython-312.pyc b/forms_py/__pycache__/cls_form_carousel.cpython-312.pyc
index dcc95f9..c1e8395 100644
Binary files a/forms_py/__pycache__/cls_form_carousel.cpython-312.pyc and b/forms_py/__pycache__/cls_form_carousel.cpython-312.pyc differ
diff --git a/forms_py/__pycache__/cls_form_contact.cpython-312.pyc b/forms_py/__pycache__/cls_form_contact.cpython-312.pyc
index 3308f39..79c534c 100644
Binary files a/forms_py/__pycache__/cls_form_contact.cpython-312.pyc and b/forms_py/__pycache__/cls_form_contact.cpython-312.pyc differ
diff --git a/forms_py/__pycache__/cls_form_login.cpython-312.pyc b/forms_py/__pycache__/cls_form_login.cpython-312.pyc
index 5c5c9b7..e1aa5c8 100644
Binary files a/forms_py/__pycache__/cls_form_login.cpython-312.pyc and b/forms_py/__pycache__/cls_form_login.cpython-312.pyc differ
diff --git a/forms_py/__pycache__/cls_recover_pswd.cpython-312.pyc b/forms_py/__pycache__/cls_recover_pswd.cpython-312.pyc
index 2dace0d..c1229dc 100644
Binary files a/forms_py/__pycache__/cls_recover_pswd.cpython-312.pyc and b/forms_py/__pycache__/cls_recover_pswd.cpython-312.pyc differ
diff --git a/forms_py/__pycache__/functions.cpython-312.pyc b/forms_py/__pycache__/functions.cpython-312.pyc
index 717c6fc..fe000fd 100644
Binary files a/forms_py/__pycache__/functions.cpython-312.pyc and b/forms_py/__pycache__/functions.cpython-312.pyc differ
diff --git a/templates/d_methodology/methodology.html b/templates/d_methodology/methodology.html
index 65a5583..43ccb4d 100644
--- a/templates/d_methodology/methodology.html
+++ b/templates/d_methodology/methodology.html
@@ -10,7 +10,10 @@
 {% block body %}
 
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 94e4367c31b015af0d4c0e4325ec73836c63754e
 <img src="{{ url_for('static', filename='y_img/methodology/m-02.svg') }}" alt="Metodología" data-aos="fade-up" data-aos-delay="0" data-aos-duration="800">
 
 
@@ -26,7 +29,10 @@
   });
 </script> -->
 
+<<<<<<< HEAD
   
+=======
+>>>>>>> 94e4367c31b015af0d4c0e4325ec73836c63754e
 {% endblock body %}
 
 {% block js %}
diff --git a/templates/g_login/recover_pswd.html b/templates/g_login/recover_pswd.html
index e5be38e..6e9faea 100644
--- a/templates/g_login/recover_pswd.html
+++ b/templates/g_login/recover_pswd.html
@@ -39,7 +39,7 @@
 
     <div class="form-footer">
       <a href="{{ url_for('login') }}" class="forgot-password">
-        <i class="bi bi-arrow-left me-1"></i> Regresar al Log In
+        <i class="bi bi-arrow-left me-1"></i> Regresar al Login
       </a>
     </div>
   
diff --git a/templates/z_comps/navbar.html b/templates/z_comps/navbar.html
index 85474cb..3f03ab5 100644
--- a/templates/z_comps/navbar.html
+++ b/templates/z_comps/navbar.html
@@ -80,7 +80,7 @@
         
         <!-- Log In -->
         <li class="nav-item">
-          <a class="nav-link {% if active_page == 'login' %}active{% endif %}" href="{{url_for('login')}}">Log In</a>
+          <a class="nav-link {% if active_page == 'login' %}active{% endif %}" href="{{url_for('login')}}">Login</a>
         </li>