I’d love to see it if that’s possible - merge conflict cleanup can be some of the hardest calls, imo, particularly when the ‘right’ merge is actually a hybridized block that contains elements from both theirs and mine. I feel like introducing today’s LLM into the process would only end up making things harder to untangle.