diff --git a/poetry.lock b/poetry.lock
index 2c77f0cce1..eb4f2a0c13 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -5111,8 +5111,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = ">3.8.1, < 3.10"
-<<<<<<< HEAD
-content-hash = "d5d9b1c1146a6684735d7e4c4016db001f8faad1eb0a55e00daac6dc4fc070fe"
-=======
-content-hash = "49314731cbc5a57e03fe03c0b3039aeec30db4ff2b37b6c3bc42a9cf71fc3090"
->>>>>>> 5f7cedbc37 (Add vcenter as inventory source)
+content-hash = "ece1db60a0522861ddeff3f1274a91e08181ac0bafc0955199cbd0a934b6b2f8"
diff --git a/pyproject.toml b/pyproject.toml
index 359c246f56..a6bd7bad57 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -52,12 +52,9 @@ packaging = "~21.3"
 psutil = "~5.9.4"
 jellyfish = "~0.10"
 altair = '>3.2, <5.0'
-<<<<<<< HEAD
 pydantic = '< 2.0'
 numpy = '~1.20'
-=======
 pyvmomi = "^8.0.2.0.1"
->>>>>>> 5f7cedbc37 (Add vcenter as inventory source)
 
 [tool.poetry.dev-dependencies]
 pylint = "*"