[cubefox]

We have LLMs now, couldn't they be used to merge conflicts in a more sensible way? It might get a little expensive I imagine.