diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 71767d08..d2146b13 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+<<<<<<< HEAD
+=======
+# cat docker/settings_local.template.py | envsubst > re2o/settings_local.py
+cp docker/settings_local.template.py re2o/settings_local.py
+
+>>>>>>> 33bacb65 (Add decouple)
 cp -n cotisations/templates/cotisations/invoice.html templates/default_invoice.html
 cp -n cotisations/templates/cotisations/voucher.html templates/default_voucher.html
 
diff --git a/poetry.lock b/poetry.lock
index 02579a1b..b85ea767 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2167,6 +2167,7 @@ lock-version = "2.0"
 python-versions = ">=3.8,<4.0"
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 content-hash = "35c7fcf4285d44bb7287cb8d9573f327beec53c61979faae77a8c077c2560930"
 =======
 content-hash = "2ee7b73659d0ea743ca62e05d7dd39be39a3f8cbb61688aa0e58bd728c3e21ce"
@@ -2174,3 +2175,6 @@ content-hash = "2ee7b73659d0ea743ca62e05d7dd39be39a3f8cbb61688aa0e58bd728c3e21ce
 =======
 content-hash = "638f084a0a517296e8a9f376d2f5b1495db4b951da0f608d7d96d91ad088cf08"
 >>>>>>> fb5f4ad3 (lock)
+=======
+content-hash = "e3b482272ea83061d7f895adf661243b4b2b96cac5c61a69295977f0d7464f3f"
+>>>>>>> 33bacb65 (Add decouple)
diff --git a/pyproject.toml b/pyproject.toml
index 78bcc9e5..285e8d32 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -59,14 +59,9 @@ 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"]