[bhubert]

As far as I can tell, Pijul[0] aims to have better conflict resolution and merge correctness. I'm not super into the theory, so I can't explain it very well, but it looks promising.

[0] https://pijul.org/