fix: resolve merge conflicts with main

Author: carlos-alm

Cargo.lock

@@ -40,6 +40,8 @@ tree-sitter-gleam = "1"
 tree-sitter-julia = "0.23"
 tree-sitter-clojure-orchard = "0.2"
 tree-sitter-erlang = "0.16"
+tree-sitter-groovy = "0.1"
+tree-sitter-r = "1.2"
 tree-sitter-solidity = "1.2"
 rayon = "1"
 ignore = "0.4"