If you think about it, merge conflicts are just a more infuriating type of programming If agents can code, agents can solve conflicts Here's my technique for doing that:↗