diff --git a/README.md b/README.md
index bb9e04c..83a8d6c 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,10 @@
 # Epsilon theme
 
-<<<<<<< HEAD
 A dark theme with . You can also find this theme for [Kitty](https://github.com/coryab/epsilon.kitty), and [Tmux](https://github.com/coryab/epsilon.tmux).
 
 This theme is a work in progress, so it may change at any time.
 
 There is also a lualine themes included.
-=======
-A dark theme. You can also find this theme for [Kitty](https://github.com/coryab/epsilon.kitty), and [Tmux](https://github.com/coryab/epsilon.tmux).
->>>>>>> d040be7a348237eead0763f6d82ff9c2f635d97a
 
 ## Theme