diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index d2146b13..f52e8220 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,12 +1,20 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+<<<<<<< HEAD
 <<<<<<< 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)
+=======
+# cat docker/settings_local.template.py | envsubst > re2o/settings_local.py
+cp docker/settings_local.template.py re2o/settings_local.py
+
+=======
+>>>>>>> ab75f416 (Change the way the dev docker works)
+>>>>>>> 907fc353 (Change the way the dev docker works)
 cp -n cotisations/templates/cotisations/invoice.html templates/default_invoice.html
 cp -n cotisations/templates/cotisations/voucher.html templates/default_voucher.html