diff --git a/backend/requirements.txt b/backend/requirements.txt
index 5b102572..6560bd84 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -43,11 +43,8 @@ mcp_use>=1.0.0
 aiohttp>=3.9.0
 email-validator>=2.0.0
 mailtrap>=2.0.1
-<<<<<<< HEAD
 cryptography>=41.0.0
 apscheduler>=3.10.0
 croniter>=1.4.0
 qstash>=2.0.0
-=======
-structlog==25.4.0
->>>>>>> main
+structlog==25.4.0
\ No newline at end of file