diff --git a/requirements.txt b/requirements.txt
index d6cc97d..749c241 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,4 @@ regex>=2024.11.6,<2027
 requests>=2.32,<3.0
 beautifulsoup4>=4.12,<5.0
 curl_cffi>=0.7,<1.0
-<<<<<<< HEAD
 tzdata>=2024.1
-=======
->>>>>>> e4bedb1264fca8a6bc8a41f0ca1ff67b176c6651