diff --git a/README.md b/README.md
index 6307023..b73a01f 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,9 @@ Other plugins may work as well, but don't are explicitly configured.
 - [NVIM Tree](https://github.com/nvim-tree/nvim-tree.lua)
 - [NVIM Treesitter](https://github.com/nvim-treesitter/nvim-treesitter)
 - [NVIM Ufo](https://github.com/kevinhwang91/nvim-ufo)
-- [VIM Illuminate](https://github.com/RRethy/vim-illuminate)
+- [resolve.nvim](https://github.com/spacedentist/resolve.nvim)
 - [Todo Comments](https://github.com/folke/todo-comments.nvim)
+- [VIM Illuminate](https://github.com/RRethy/vim-illuminate)
 - [Wilder](https://github.com/gelguy/wilder.nvim)
 
 ## Setup
diff --git a/lua/tccs/theme.lua b/lua/tccs/theme.lua
index 6160d5a..86331e2 100644
--- a/lua/tccs/theme.lua
+++ b/lua/tccs/theme.lua
@@ -314,6 +314,15 @@ theme.set_highlights = function(opts)
   hl(0, "YankHighlight", { bg = c.yank_fg })
   hl(0, "TextYankPost", { bg = c.yank_fg })
 
+  -- resolve.nvim
+  hl(0, "ResolveOursMarker", { bg = c.added_fg, bold = true })
+  hl(0, "ResolveTheirsMarker", { bg = c.modified_fg, bold = true })
+  hl(0, "ResolveSeparatorMarker", { bg = c.border, bold = true })
+  hl(0, "ResolveAncestorMarker", { bg = c.removed_fg, bold = true })
+  hl(0, "ResolveOursSection", { bg = c.added_bg })
+  hl(0, "ResolveTheirsSection", { bg = c.modified_bg })
+  hl(0, "ResolveAncestorSection", { bg = c.removed_bg })
+
 end
 
 return theme