fixed merge conflict

init.lua

@@ -147,6 +147,7 @@ local function packer_startup(use)
 	use 'mfussenegger/nvim-dap'
 	use 'mfussenegger/nvim-dap-python' -- follow instructions or start venv before starting nvim.
 	use 'theHamsta/nvim-dap-virtual-text'
+	use 'leoluz/nvim-dap-go'
 
 	use "ellisonleao/gruvbox.nvim"
 
@@ -313,6 +314,7 @@ local function packer_startup(use)
 	-- More configurations:
 	-- https://github.com/mfussenegger/nvim-dap/wiki/Debug-Adapter-installation#go
 	require'dap-python'.setup('~/.virtualenvs/debugpy/bin/python')
+	require'dap-go'.setup()
 
 
 	dap.adapters.gdb = {
@@ -336,10 +338,7 @@ local function packer_startup(use)
 
 	-- nicer debugging. displays variable values inline
 	-- https://github.com/theHamsta/nvim-dap-virtual-text
-	require'nvim-dap-virtual-text'.setup{
-
-	}
-
+	require'nvim-dap-virtual-text'.setup{}
 end
 
 ---@param name string
@@ -364,8 +363,7 @@ vim.api.nvim_create_user_command(
 	'S',
 	function ()
 		---@type string
-		local snippets_path = vim.fn.stdpath('config') .. '/snippets/' ..
-							  vim.api.nvim_buf_get_option(0, "filetype") .. '.snippets'
+		local snippets_path = vim.fn.stdpath('config') .. '/snippets/' .. vim.api.nvim_buf_get_option(0, "filetype") .. '.snippets'
 
 		if not file_exists(snippets_path) then
 			local file = io.open( snippets_path, 'w' )