fix merge conflict

.gitignore

@@ -0,0 +1,2 @@
+nvim-pack-lock.json 
+.luarc.json

.luarc.json

@@ -1,6 +0,0 @@
-{
-    "diagnostics.globals": [
-        "vim",
-        "Snacks"
-    ]
-}

nvim-pack-lock.json

@@ -1,60 +0,0 @@
-{
-  "plugins": {
-    "base16-nvim": {
-      "rev": "23e5128eb5f629c29532c24a1e733cbe019f05bb",
-      "src": "https://github.com/RRethy/base16-nvim"
-    },
-    "blink.cmp": {
-      "rev": "78336bc89ee5365633bcf754d93df01678b5c08f",
-      "src": "https://github.com/Saghen/blink.cmp"
-    },
-    "blink.lib": {
-      "rev": "c09dd66e9ad97e1a7777f3fa5f0504ca2e877231",
-      "src": "https://github.com/saghen/blink.lib"
-    },
-    "bufferline.nvim": {
-      "rev": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3",
-      "src": "https://github.com/akinsho/bufferline.nvim"
-    },
-    "cord.nvim": {
-      "rev": "0be090969e978f7442870ef227e09eff7bf3480d",
-      "src": "https://github.com/vyfor/cord.nvim"
-    },
-    "lspsaga.nvim": {
-      "rev": "3e33a6a6c5d379f3d4fae77fae6b53b762a0a30f",
-      "src": "https://github.com/nvimdev/lspsaga.nvim"
-    },
-    "lualine.nvim": {
-      "rev": "131a558e13f9f28b15cd235557150ccb23f89286",
-      "src": "https://github.com/nvim-lualine/lualine.nvim"
-    },
-    "mason-lspconfig.nvim": {
-      "rev": "7b01e2974a47d489bb92f47a41e4c0088ea8f86e",
-      "src": "https://github.com/mason-org/mason-lspconfig.nvim.git"
-    },
-    "mason.nvim": {
-      "rev": "bb639d4bf385a4d89f478b83af4d770be05ab7eb",
-      "src": "https://github.com/mason-org/mason.nvim.git"
-    },
-    "nvim-lspconfig": {
-      "rev": "a4ed4e761c400849e8c9f8bda33e5083f890268c",
-      "src": "https://github.com/neovim/nvim-lspconfig"
-    },
-    "nvim-treesitter": {
-      "rev": "4916d6592ede8c07973490d9322f187e07dfefac",
-      "src": "https://github.com/nvim-treesitter/nvim-treesitter"
-    },
-    "nvim-web-devicons": {
-      "rev": "0d7d35fa946837b8738b17c18d1faa1ac351e7f9",
-      "src": "https://github.com/nvim-tree/nvim-web-devicons"
-    },
-    "snacks.nvim": {
-      "rev": "882c996cf28183f4d63640de0b4c02ec886d01f2",
-      "src": "https://github.com/folke/snacks.nvim"
-    },
-    "tinted-vim": {
-      "rev": "c086276f0227f41d17b68b1fe2e378b3b113401d",
-      "src": "https://github.com/tinted-theming/tinted-vim"
-    }
-  }
-}