diff --git a/requests.txt b/requests.txt
index 69b0f12..1da20e7 100644
--- a/requests.txt
+++ b/requests.txt
@@ -4,8 +4,4 @@ fastapi-mail==0.3.7
 GitPython==3.1.18
 pydantic==1.8.2
 redis==3.2.1
-<<<<<<< HEAD
-
-=======
 uvicorn==0.15.0
->>>>>>> a89138ebdb67e404f724e5ee425cc5c49664498c