diff --git a/lan-diaspora.md b/lan-diaspora.md
index 9a14f38..f5aaafe 100644
--- a/lan-diaspora.md
+++ b/lan-diaspora.md
@@ -1,14 +1,7 @@
 [![lan](https://images.fireside.fm/podcasts/images/d/dec90738-e640-45e5-b375-4573052f4bf4/cover_small.jpg)](https://linuxactionnews.com)  
 
-<<<<<<< HEAD
 ## [Episode 110](https://linuxactionnews.com/110) - 06/16/2019 
-=======
-< HEAD
-## [Episode 109](https://linuxactionnews.com/109) - 06/09/2019
-=======
-## [Episode 108](https://linuxactionnews.com/108) - 06/03/2019 
->>>>>>> 252cbc83b45a933985c7223acd76ae4c41e3f596
->>>>>>> a7e3ad85f90dcbca6a49e4eb25513022f0c25e1c
+
 
 ### Description: