diff --git a/tmpl/lmConf-1.json b/tmpl/lmConf-1.json
index 408b2a0..1397ff0 100644
--- a/tmpl/lmConf-1.json
+++ b/tmpl/lmConf-1.json
@@ -196,7 +196,6 @@
     "macros": {
         "_whatToTrace": "$_auth eq 'SAML' ? \"$_user\\@$_idpConfKey\" : \"$_user\""
     },
-<<<<<<< HEAD
     "mailCharset": "utf-8",
     "mailConfirmSubject": "[LemonLDAP::NG] Password reset confirmation",
     "mailFrom": "noreply@%%nom_domaine_local",