diff --git a/requirements.txt b/requirements.txt
index 542132e..3516563 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,7 @@
 aiofiles
 aiosqlite
 apscheduler
-<<<<<<< HEAD
-bcrypt==4.0.1
-=======
 bcrypt
->>>>>>> d13ad1f907ba428b8cabab840d2715cf478065df
 diskcache
 fastapi[uvicorn]
 gunicorn