fix treesitter config, configs issue

init.lua

@@ -157,7 +157,7 @@ require('lazy').setup({
     lazy = false,
     build = ':TSUpdate',
     config = function()
-        require('nvim-treesitter.config').setup({
+        require('nvim-treesitter.configs').setup({
             ensure_installed = { 'bash', 'php', 'rust', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
             auto_install = true,
             highlight = {

lua/custom/lspconfig.lua

@@ -158,16 +158,8 @@ setup_server("intelephense", {
     init_options = {
         licenceKey = (function()
             local license_path = vim.fn.expand("$HOME/.config/intelephense/license.txt")
-<<<<<<< HEAD
             if vim.fn.filereadable(license_path) == 1 then
                 return vim.fn.readfile(license_path)[1]
-=======
-            local file = io.open(license_path, "r")
-            if file then
-                local content = file:read("*l") -- read first line
-                file:close()
-                return content
->>>>>>> fbcc0b8d619e6f84448645f49d0a1dda9de840e5
             end
             return nil
         end)(),