the feature/tree-sihter branch hasn't gotten any updates in nearly two months and it seems having some conflicts with the master branch that require manual resolve. Is this branch ready to be merged into master branch or it needs more time and rounds of reviews?