diff --git a/backend/app/core/database.py b/backend/app/core/database.py
index f4852d1..fffbbdd 100644
--- a/backend/app/core/database.py
+++ b/backend/app/core/database.py
@@ -11,13 +11,8 @@ DATABASE_URL = os.getenv(
 engine = create_engine(
     DATABASE_URL,
     pool_pre_ping=True,
-<<<<<<< Updated upstream
     pool_size=20,
     max_overflow=40,
-=======
-    pool_size=20,
-    max_overflow=40,
->>>>>>> Stashed changes
     pool_recycle=3600,
     pool_timeout=30,
     echo=False