diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua
index d801b56..cb9eafd 100644
--- a/lua/plugins/avante.lua
+++ b/lua/plugins/avante.lua
@@ -65,19 +65,19 @@ return {
         reverse_switch_windows = "<S-Tab>",
       },
     },
-    hints = { enabled = false },
+    hints = { enabled = false }, -- <leader>ae <leader>aa hinted in visual mode
     windows = {
       ---@type "right" | "left" | "top" | "bottom"
       position = "right", -- the position of the sidebar
       wrap = true, -- similar to vim.o.wrap
       width = 30, -- default % based on available width
       sidebar_header = {
-        enabled = true, -- true, false to enable/disable the header
+        enabled = false, -- true, false to enable/disable the header
         align = "center", -- left, center, right for title
         rounded = true,
       },
       input = {
-        prefix = "> ",
+        prefix = "",
         height = 8, -- Height of the input window in vertical layout
       },
       edit = {
@@ -86,7 +86,7 @@ return {
       },
       ask = {
         floating = false, -- Open the 'AvanteAsk' prompt in a floating window
-        start_insert = true, -- Start insert mode when opening the ask window
+        start_insert = false, -- Start insert mode when opening the ask window
         border = "rounded",
         ---@type "ours" | "theirs"
         focus_on_apply = "ours", -- which diff to focus after applying
diff --git a/lua/plugins/color-scheme.lua b/lua/plugins/color-scheme.lua
index d5057bd..770470a 100644
--- a/lua/plugins/color-scheme.lua
+++ b/lua/plugins/color-scheme.lua
@@ -36,7 +36,7 @@ return {
         highlights.Pmenu = { bg = colors.bg_alt }
         highlights.PmenuSel = { bg = colors.bg_hl_line }
         highlights.PmenuExtra = { bg = colors.bg_alt }
-        highlights.FloatBorder = { bg = colors.bg_alt, fg = colors.fg_main }
+        highlights.FloatBorder = { bg = colors.bg_main, fg = colors.fg_main }
         highlights.LspFloatWinBorder = { fg = colors.fg_main, bg = colors.bg_main, style = "bold" } -- border to the documentation window
         highlights.LspFloatWinNormal = { bg = colors.bg_main, style = "bold" } -- Change the floating windows background to light grey
         -- highlights.NoicePopupBorder = { fg = colors.red }
@@ -44,6 +44,12 @@ return {
         highlights.CursorLine = { bg = "#effaff" }
         highlights.Directory = { fg = "#000000" }
         -- highlights.LineNr = { fg = colors.fg_dim, bg = "#ffffff" }
+        highlights["NormalNC"] = { bg = "#ffffff" }
+        highlights["GitConflictAncestor"] = { bg = "#d9e4ff", fg = colors.fg_main }
+        highlights["GitConflictAncestorLabel"] = { bg = "#8b95f6", fg = colors.fg_main, bold = true }
+        highlights["GitConflictIncoming"] = { bg = colors.visual, fg = colors.fg_main, bold = false }
+        highlights["GitConflictIncomingLabel"] = { bg = "#90d8b2", fg = colors.fg_main, bold = true }
+        highlights["GitConflictCurrentLabel"] = { bg = "#ddad24", bold = true }
 
         -- Code
         highlights.String = { fg = "#0c703e" }
diff --git a/lua/plugins/git-conflict.lua b/lua/plugins/git-conflict.lua
new file mode 100644
index 0000000..1abb95f
--- /dev/null
+++ b/lua/plugins/git-conflict.lua
@@ -0,0 +1,16 @@
+return {
+  "akinsho/git-conflict.nvim",
+  version = "*",
+  config = true,
+  opts = {
+    default_mappings = true, -- disable buffer local mapping created by this plugin
+    default_commands = true, -- disable commands created by this plugin
+    disable_diagnostics = true, -- This will disable the diagnostics in a buffer whilst it is conflicted
+    list_opener = "copen", -- command or function to open the conflicts list
+    highlights = { -- They must have background color, otherwise the default color will be used
+      incoming = "DiffAdd",
+      current = "DiffText",
+      ancestor = "DiffChange",
+    },
+  },
+}
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
index 66f9483..19950ea 100644
--- a/lua/plugins/oil.lua
+++ b/lua/plugins/oil.lua
@@ -2,7 +2,14 @@ return {
   "stevearc/oil.nvim",
   ---@module 'oil'
   ---@type oil.SetupOpts
-  opts = {},
+  opts = {
+    columns = {
+      "icon",
+      -- "permissions",
+      -- "size",
+      -- "mtime",
+    },
+  },
   -- Optional dependencies
   dependencies = { { "echasnovski/mini.icons", opts = {} } },
   -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons