diff --git a/pyproject.toml b/pyproject.toml
index 665d96e..1430d91 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,12 +12,6 @@ dependencies = [
     "PyVISA==1.14.1",
     "PyVISA-py==0.7.1",
     "setuptools==65.5.0",
-    "typing_extensions==4.9.0",
-    "zeroconf==0.131.0",
-<<<<<<< HEAD
-=======
-    "typing-extensions==4.9.0",
->>>>>>> ee5d585f01664255688748582a87f41dbc4af185
 ]
 authors = [
     {name = "Ali Nwegy", email = "ali.el-nwegy@tuhh.de"},
@@ -25,11 +19,7 @@ authors = [
 license = {text = "MIT"}
 
 [tool.pdm]
-<<<<<<< HEAD
 sdist = true
 
 [tool.pdm.scripts]
 edit = {shell = "$VISUAL src/"}
-=======
-distribution = true
->>>>>>> ee5d585f01664255688748582a87f41dbc4af185