diff --git a/config/settings/base.py b/config/settings/base.py
index 73de4ea73..3ccc09a90 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -381,11 +381,7 @@
     "DJANGO_ENVERGO_AMENAGEMENT_DOMAIN", default="envergo.beta.gouv.fr"
 )
 ENVERGO_HAIE_DOMAIN = env("DJANGO_ENVERGO_HAIE_DOMAIN", default="haie.beta.gouv.fr")
-<<<<<<< HEAD
 
 DEMARCHES_SIMPLIFIEE_HAIE_URL = "https://www.demarches-simplifiees.fr/commencer/test-declaration-de-travaux-sur-haies"
-||||||| parent of 6a07ed9e (Fix new file mattermost notification format)
-=======
 
 OPS_MATTERMOST_HANDLERS = env.list("DJANGO_OPS_MATTERMOST_HANDLERS", default=[])
->>>>>>> 6a07ed9e (Fix new file mattermost notification format)