noop the noops

vim/.vim/lua/plugins/nvim-treesitter.lua

@@ -64,6 +64,7 @@ return {
 						end
 					end,
 
+<<<<<<< HEAD
 					-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
 					-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
 					-- Using this option may slow down your editor, and you may see some duplicate highlights.
@@ -74,4 +75,15 @@ return {
 		end,
 		lazy = false,
 	},
+=======
+				-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+				-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+				-- Using this option may slow down your editor, and you may see some duplicate highlights.
+				-- Instead of true it can also be a list of languages
+				additional_vim_regex_highlighting = { "java", "kotlin" },
+			},
+		})
+	end,
+	lazy = false,
+>>>>>>> 3251d2e (noop the noops)
 }