diff --git a/nvim/lua/user/plugins/ui/nvimtree.lua b/nvim/lua/user/plugins/ui/nvimtree.lua
index 7762864..3d0bbe0 100644
--- a/nvim/lua/user/plugins/ui/nvimtree.lua
+++ b/nvim/lua/user/plugins/ui/nvimtree.lua
@@ -35,13 +35,14 @@ local options = {
         hidden_display = "simple",
         highlight_opened_files = "name",
         highlight_hidden = "name",
-        special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md", "composer.json" },
+        -- special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md", "composer.json" },
+        special_files = {},
         icons = {
-            git_placement = "signcolumn",
+            git_placement = "right_align",
             diagnostics_placement = "right_align",
             modified_placement = "right_align",
             show = {
-                -- folder_arrow = false
+                folder_arrow = false
             },
             glyphs = {
                 default = icons.files.default,
@@ -62,7 +63,7 @@ local options = {
                 git = {
                     unstaged = icons.gitsigns.unstaged,
                     staged = icons.gitsigns.staged,
-                    unmerged = "",
+                    unmerged = icons.gitsigns.unmerged,
                     renamed = icons.gitsigns.renamed,
                     untracked = icons.gitsigns.untracked,
                     deleted = icons.gitsigns.deleted,