diff --git a/pyproject.toml b/pyproject.toml
index b707d1cae33..ceac22485c1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -61,11 +61,7 @@ boto3 = { version = "1.40.76", optional = true }
 redisvl = {version = "^0.4.1", optional = true, markers = "python_version >= '3.9' and python_version < '3.14'"}
 mcp = {version = ">=1.25.0,<2.0.0", optional = true, python = ">=3.10"}
 a2a-sdk = {version = "^0.3.22", optional = true, python = ">=3.10"}
-<<<<<<< HEAD
-litellm-proxy-extras = {version = "0.4.41", optional = true}
-=======
 litellm-proxy-extras = {version = "0.4.43", optional = true}
->>>>>>> origin
 rich = {version = "13.7.1", optional = true}
 litellm-enterprise = {version = "0.1.32", optional = true}
 diskcache = {version = "^5.6.1", optional = true}