diff --git a/.config/nvim-notes/lazy-lock.json b/.config/nvim-notes/lazy-lock.json
index c08da75..f1144f3 100644
--- a/.config/nvim-notes/lazy-lock.json
+++ b/.config/nvim-notes/lazy-lock.json
@@ -9,6 +9,7 @@
   "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
   "fzf-lua": { "branch": "main", "commit": "c054a21cd22cef41c62ce96247040abccaab8dbc" },
+  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
   "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
   "grug-far.nvim": { "branch": "main", "commit": "c88435b825a35bfa468b47159709b3221976ecd1" },
   "gruvbox.nvim": { "branch": "main", "commit": "68c3460a5d1d1a362318960035c9f3466d5011f5" },
@@ -43,5 +44,6 @@
   "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
   "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
   "typescript.nvim": { "branch": "main", "commit": "4de85ef699d7e6010528dcfbddc2ed4c2c421467" },
-  "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" }
+  "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" },
+  "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }
 }
diff --git a/.config/nvim-notes/lua/config/autocmds.lua b/.config/nvim-notes/lua/config/autocmds.lua
index ca68771..622a7ea 100644
--- a/.config/nvim-notes/lua/config/autocmds.lua
+++ b/.config/nvim-notes/lua/config/autocmds.lua
@@ -45,11 +45,19 @@ vim.api.nvim_create_autocmd("VimLeavePre", {
 
 vim.api.nvim_create_autocmd("VimEnter", {
   callback = function()
-    print("Updating...")
-    local command = "git pull --rebase --quiet --no-edit &> /dev/null"
-    local pullSuccess = os.execute(command)
-    if pullSuccess > 0 then
-      os.execute(command)
-    end
+    vim.defer_fn(function()
+      local command = "git pull --rebase --quiet --no-edit &> /dev/null"
+      local pullSuccess = os.execute(command)
+      if pullSuccess == 256 then
+        vim.notify("Conflicts found. Please resolve and continue rebase", "error", {
+          title = "Updating...",
+        })
+        return
+      end
+
+      vim.notify("Pull success", "info", {
+        title = "Updating...",
+      })
+    end, 100)
   end,
 })
diff --git a/.config/nvim-notes/lua/plugins/git-conflict.lua b/.config/nvim-notes/lua/plugins/git-conflict.lua
new file mode 100644
index 0000000..a748582
--- /dev/null
+++ b/.config/nvim-notes/lua/plugins/git-conflict.lua
@@ -0,0 +1,5 @@
+return {
+  "akinsho/git-conflict.nvim",
+  version = "*",
+  config = true,
+}
diff --git a/.config/nvim-notes/lua/plugins/wilder.lua b/.config/nvim-notes/lua/plugins/wilder.lua
new file mode 100644
index 0000000..cd226c9
--- /dev/null
+++ b/.config/nvim-notes/lua/plugins/wilder.lua
@@ -0,0 +1,4 @@
+return {
+  "gelguy/wilder.nvim",
+  config = function() end,
+}