fix merge conflicts

lua/custom/plugins/init.lua

@@ -1,5 +0,0 @@
--- You can add your own plugins here or in other files in this directory!
---  I promise not to create any merge conflicts in this directory :)
---
--- See the kickstart.nvim README for more information
-return {}

lua/custom/plugins/nvim-tree.lua

@@ -0,0 +1,21 @@
+return {
+  {
+    "nvim-tree/nvim-tree.lua",
+    version = "*",
+    lazy = false,
+    dependencies = {
+      "nvim-tree/nvim-web-devicons",
+    },
+    window = {
+      mappings = {
+        ["<space>"] = "none",
+      },
+    },
+    keys = {
+      { "<leader>e",  "<cmd>NvimTreeToggle<cr>", desc = "Nvim[T]ree [T]oggle" },
+      { "<leader>ef", "<cmd>NvimTreeFocus<cr>",  desc = "Nvim[T]ree [F]ocus " },
+      { "<leader>eo", "<cmd>NvimTreeOpen<cr>",   desc = "Nvim[T]ree [O]pen" },
+      { "<leader>ex", "<cmd>NvimTreeClose<cr>",  desc = "Nvim[T]ree [C]lose" },
+    },
+  },
+}