diff --git a/Guide.md b/Guide.md
index 6752d7f..ad51e14 100644
--- a/Guide.md
+++ b/Guide.md
@@ -31,10 +31,7 @@ pacman -S dunst
 
 ```
 yay onedrive-abraunegg onedrive_tray-git
-<<<<<<< HEAD
 yay typora-free
-=======
->>>>>>> 8590bb0c29c558fb73c4132762a346ded7b986ce
 ``` 
 
 Take the folowwing config files