diff --git a/lua/nvim-tree/renderer.lua b/lua/nvim-tree/renderer.lua
index 2913b53e..3f03577a 100644
--- a/lua/nvim-tree/renderer.lua
+++ b/lua/nvim-tree/renderer.lua
@@ -129,6 +129,7 @@ if vim.g.nvim_tree_git_hl == 1 then
     ["R "] = { { hl = "NvimTreeFileRenamed" } },
     ["UU"] = { { hl = "NvimTreeFileMerge" } },
     ["UD"] = { { hl = "NvimTreeFileMerge" } },
+    ["UA"] = { { hl = "NvimTreeFileMerge" } },
     [" D"] = { { hl = "NvimTreeFileDeleted" } },
     ["DD"] = { { hl = "NvimTreeFileDeleted" } },
     ["RD"] = { { hl = "NvimTreeFileDeleted" } },
@@ -204,6 +205,7 @@ if icon_state.show_git_icon then
     },
     ["UU"] = { { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" } },
     ["UD"] = { { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" } },
+    ["UA"] = { { icon = icon_state.icons.git_icons.unmerged, hl = "NvimTreeGitMerge" } },
     [" D"] = { { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" } },
     ["D "] = { { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" } },
     ["RD"] = { { icon = icon_state.icons.git_icons.deleted, hl = "NvimTreeGitDeleted" } },