diff --git a/pyproject.toml b/pyproject.toml
index 285e8d32..78bcc9e5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -59,9 +59,14 @@ mysqlclient = {version = "^2.0.3", optional=true}
 psycopg2 = {version = ">=2.8,<2.9", optional=true}
 django-ldapdb = {version = "^1.5.1", optional=true}
 xhtml2pdf = "^0.2.6"
+<<<<<<< HEAD
 pylint-django = {version = "^2.5.5", optional=true}
 pylint = {version = "^3.1.0", optional=true}
 python-decouple = "^3.8"
+=======
+pylint-django = {version = ">=2.5.5", optional=true}
+pylint = {version = ">=3.1.0", optional=true}
+>>>>>>> 534a501d (lint)
 
 [tool.poetry.extras]
 mysql = ["mysqlclient"]