diff --git a/relay/src/relay.js b/relay/src/relay.js
index e2eabc7..50d77e1 100644
--- a/relay/src/relay.js
+++ b/relay/src/relay.js
@@ -16,13 +16,9 @@ import logger from './logger.js'
 import { connectElectrum } from "./doichain/connectElectrum.js"
 import { scanBlockchainForNameOps } from '../src/pinner/scanBlockchainForNameOps.js'
 
-<<<<<<< HEAD
 console.log("RELAY_PUBSUB_PEER_DISCOVERY_TOPICS", pubsubPeerDiscoveryTopics)
 // the peer id of the above key
 // const relayId = '12D3KooWAJjbRkp8FPF5MKgMU53aUTxWkqvDrs4zc1VMbwRwfsbE'
-=======
-import fs from 'fs/promises'
->>>>>>> dynamic-pricing
 
 import { createHttpServer } from './httpServer.js'
 import TipWatcher from './pinner/tipWatcher.js'