diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua
index 96c0c2d..341d540 100644
--- a/lua/plugins/neo-tree.lua
+++ b/lua/plugins/neo-tree.lua
@@ -34,7 +34,6 @@ require "window-picker".setup(
       }
     }
     -- other_win_hl_color = "#519aba"
->>>>>>> 0c8096cb6eee895e8f52091b51923d6e3d7ff9aa
   }
 )