diff --git a/requirements.txt b/requirements.txt
index 611e2d5..9a429a3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,13 +7,10 @@ pycryptodome==3.20.0
 requests==2.31.0
 PyJWT==2.8.0
 httpx[http2]==0.27.0
-<<<<<<< HEAD
 channels[daphne]==4.1.0
 twisted[http2,tls]==24.11.0
 channels-redis==4.2.1
-=======
 pandas==2.2.2
 xlrd==2.0.1
 openpyxl==3.1.5
 django-filter==24.3
->>>>>>> main