Don't forget mergiraf, for tree-sitter-based conflict resolution:

https://mergiraf.org/