diff --git a/collections/tech/primitives/network/mycelium.md b/collections/tech/primitives/network/mycelium.md
index 86ca200..af01615 100644
--- a/collections/tech/primitives/network/mycelium.md
+++ b/collections/tech/primitives/network/mycelium.md
@@ -1,18 +1,9 @@
-
-<<<<<<< HEAD
-# Mycelium: Our Planetary Network as used in the TFGrid
-
+# Mycelium: Our Planetary Network
 
 ![alt text](img/mycelium.png)
-=======
-# Mycelium: Our Planetary Network
 
 The planetary network called Mycelium is an overlay network which lives on top of the existing Internet or other peer-to-peer networks created. 
 
-![](img/planet_net_.jpg)
-
 In the Mycelium network, everyone is connected to everyone. End-to-end encryption between users of an app and the app runs behind the network wall.
->>>>>>> ba303b6e3eb8220bf2851a949db109e68ccd1f8c
-
 
 !!wiki.include page:'tech:mycelium_incl.md'
\ No newline at end of file