diff --git a/packages/network/src/node.ts b/packages/network/src/node.ts
index c9b6525e..e7a99bf1 100644
--- a/packages/network/src/node.ts
+++ b/packages/network/src/node.ts
@@ -204,11 +204,8 @@ export class TopologyNetworkNode {
 			for (const address of sortedAddrs) {
 				this._node?.dial(address);
 			}
-<<<<<<< HEAD
-=======
 
 			log.info("::start::peer::discovery", e.detail);
->>>>>>> 02a2e65 (feat: add new bootstrap nodes; sort order for dialing discovered ma's (#246))
 		});
 
 		this._node.addEventListener("peer:identify", (e) => {