diff --git a/backend/.env.dist b/backend/.env.dist
index c0a2a6098..7cc0e9737 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -62,7 +62,11 @@ EVENT_PROTOCOL_DISABLED=false
 # LOG_LEVEL=info
 
 # Federation
+<<<<<<< HEAD
 # if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
+=======
+# if you set the value of FEDERATE_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
+>>>>>>> 192ab67817a12f0a765caa48c0e13272b7310b25
 # on an hash created from this topic
 # FEDERATION_DHT_TOPIC=GRADIDO_HUB
 # FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f 
diff --git a/backend/.env.template b/backend/.env.template
index 1bb2e4155..f356082f8 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -57,5 +57,10 @@ WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET
 EVENT_PROTOCOL_DISABLED=$EVENT_PROTOCOL_DISABLED
 
 # Federation
+<<<<<<< HEAD
 FEDERATION_DHT_TOPIC=$FEDERATION_DHT_TOPIC
 FEDERATION_DHT_SEED=$FEDERATION_DHT_SEED
+=======
+FEDERATE_DHT_TOPIC=$FEDERATE_DHT_TOPIC
+FEDERATE_DHT_SEED=$FEDERATE_DHT_SEED
+>>>>>>> 192ab67817a12f0a765caa48c0e13272b7310b25
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 35fb191cd..1be47eec2 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -21,8 +21,13 @@ async function main() {
   // start DHT hyperswarm when DHT_TOPIC is set in .env
   if (CONFIG.FEDERATION_DHT_TOPIC) {
     // eslint-disable-next-line no-console
+<<<<<<< HEAD
     console.log(`Federation active on ${CONFIG.FEDERATION_DHT_TOPIC}`)
     await startDHT(CONFIG.FEDERATION_DHT_TOPIC) // con,
+=======
+    console.log(`Federation active on ${CONFIG.FEDERATE_DHT_TOPIC}`)
+    await startDHT(CONFIG.FEDERATE_DHT_TOPIC) // con,
+>>>>>>> 192ab67817a12f0a765caa48c0e13272b7310b25
   }
 }