diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc
index c16b18c..99ea0d8 100644
--- a/config/.config/kak/kakrc
+++ b/config/.config/kak/kakrc
@@ -436,8 +436,4 @@ map -docstring 'clipboard paste' global user p ':xpaste<ret>'
 map -docstring 'quit kakoune' global user q ':q<ret>'
 map -docstring 'toggle comments' global user c ':comment-line<ret>'
 
-<<<<<<< HEAD
-colorscheme base16-gruvbox-dark-medium
-=======
 colorscheme gruvbox-dark
->>>>>>> master