diff --git a/requirements.txt b/requirements.txt
index 0a09abb..f289519 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,4 @@
-<<<<<<< HEAD
 fastapi==0.117.1
 uvicorn==0.37.0
 pydantic==2.11.9
-=======
-fastapi==0.117.1
-uvicorn==0.37.0
-pydantic==2.11.9
->>>>>>> origin/scripts
 PyYAML==6.0.3
\ No newline at end of file