diff --git a/eshell/history b/eshell/history
index 90b4dea5..02023488 100644
--- a/eshell/history
+++ b/eshell/history
@@ -110,12 +110,9 @@ cat /tmp/bongo-mpv.socket
 youtube-dl --list-formats
 youtube-dl --list-formats https://www.youtube.com/watch?v=ry8T67AgbUM
 ls
-<<<<<<< HEAD
 cd
 ls
 rm Dynamic\ DNS\ Client\ \ 2.0.0.7\ Beta.exe
 ls
 cat xmrtobtcwall.txt
 cp mimeapps.list mimeapps.list.bak
-=======
->>>>>>> aa13c8e774c5b244c5fe6a1326d3a0b0ef3465d4