diff --git a/backend/.env.dist b/backend/.env.dist
index 7cc0e9737..c0a2a6098 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -62,11 +62,7 @@ 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 f356082f8..1bb2e4155 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -57,10 +57,5 @@ 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/federation/index.ts b/backend/src/federation/index.ts
index cbf78bc1c..352724274 100644
--- a/backend/src/federation/index.ts
+++ b/backend/src/federation/index.ts
@@ -38,7 +38,6 @@ export const startDHT = async (
 ): Promise<void> => {
   try {
     const TOPIC = DHT.hash(Buffer.from(topic))
-    logger.debug(`getSeed='${getSeed()}'`)
     const keyPair = DHT.keyPair(getSeed())
     logger.info(`keyPairDHT: publicKey=${keyPair.publicKey.toString('hex')}`)
     logger.debug(`keyPairDHT: secretKey=${keyPair.secretKey.toString('hex')}`)