diff --git a/setup.py b/setup.py
index 6c132310..790d3518 100644
--- a/setup.py
+++ b/setup.py
@@ -93,11 +93,7 @@ def find_meta(meta):
         packages=find_packages(where="src"),
         package_dir={"": "src"},
         install_requires=[
-<<<<<<< HEAD
             "cryptography>=42.0.0,<43",
-=======
-	    "cryptography>=41.0.5,<43",
->>>>>>> 9208a11 (resolved conflicts)
         ],
         extras_require={
             "test": ["flaky", "pretend", "pytest>=3.0.1"],