Currently, git merge conflict lines aren't handled properly. i.e. they are highlighted as if they are production rules instead of using their own distinct colouring.
Providing distinct highlighting would be very helpful for resolving merge conflicts (a proper LSP would be better, but I really don't have time to do that).
Filling this here instead of tm4e, since I don't think tm4e has shipped the grammar yet, and as far as I know, I'm the only one using the grammar.