@matthew
it's become so second-nature that I forget about it, but hard to overstate just how helpful Claude Code fixing merge conflicts is. I would literally pay $20/mo just for that feature alone.
Still haven't figured out how to get it to happen automatically, but man when I do...