diff --git a/app.py b/app.py
index 63c01d3a..08f966c0 100644
--- a/app.py
+++ b/app.py
@@ -124,7 +124,6 @@ app.register_blueprint(routes_user)
 def console_log(value):
     Helper_App.console_log(value)
     return value
-<<<<<<< HEAD
 
 @app.after_request
 def add_cache_headers(response):
@@ -134,6 +133,4 @@ def add_cache_headers(response):
     else:
         # No caching for dynamic content
         response.headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, max-age=0'
-    return response
-=======
->>>>>>> a5d77c11a435413c35315fe1c53b778a454279c8
+    return response
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..08e0ffd0
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,16 @@
+
+Flask==3.0.3
+gunicorn==23.0.0
+flask_wtf
+flask_sqlalchemy
+flask_cors
+flask_mail
+authlib
+jwt
+mysqlclient
+stripe
+python_dotenv
+authlib
+pydantic
+# psycopg2
+requests
\ No newline at end of file