diff --git a/vim/.vim/lua/config/lsp.lua b/vim/.vim/lua/config/lsp.lua
index 131045f..9b7233d 100644
--- a/vim/.vim/lua/config/lsp.lua
+++ b/vim/.vim/lua/config/lsp.lua
@@ -17,7 +17,7 @@ local configs = require("lspconfig.configs")
 if use_google() then
     configs.ciderlsp = {
         default_config = {
-            cmd = { "/google/bin/releases/cider/ciderlsp/ciderlsp", "--tooltag=nvim-cmp", "--forward_sync_responses" },
+            cmd = { "/google/bin/releases/cider/ciderlsp/ciderlsp", "--tooltag=nvim-cmp", "--forward_sync_responses", "--merge_diagnostic_layers" },
             filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl", "typescript"},
             -- root_dir = lspconfig.util.root_pattern("BUILD"),
             root_dir = function(fname)
diff --git a/vim/.vim/lua/config/neotree.lua b/vim/.vim/lua/config/neotree.lua
index df2ff6d..4476b38 100644
--- a/vim/.vim/lua/config/neotree.lua
+++ b/vim/.vim/lua/config/neotree.lua
@@ -1,3 +1,7 @@
 local map = require("utils").map
+require("neo-tree").setup({
+    hijack_netrw_behavior = "open_current"
+})
 
-map('n', '<C-n>', ':Neotree<cr>')
+
+map('n', '<C-n>', ':Neotree filesystem reveal toggle reveal_force_cwd<cr>')