diff --git a/pyproject.toml b/pyproject.toml
index b0fcf717a24..693cb3f7f3e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,10 @@
 [tool.poetry]
 name = "litellm"
+<<<<<<< HEAD
 version = "1.31.0"
+=======
+version = "1.30.8"
+>>>>>>> 5a3df3fa (bump: version 1.30.7 → 1.30.8)
 description = "Library to easily interface with LLM API providers"
 authors = ["BerriAI"]
 license = "MIT"
@@ -75,7 +79,11 @@ requires = ["poetry-core", "wheel"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.commitizen]
+<<<<<<< HEAD
 version = "1.31.0"
+=======
+version = "1.30.8"
+>>>>>>> 5a3df3fa (bump: version 1.30.7 → 1.30.8)
 version_files = [
     "pyproject.toml:^version"
 ]