Claude resolved a major Git conflict (while I made a brew)

TL;DR I forgot to merge a large refactor PR before starting on the equally large Grapple feature. I asked Claude to sort out the conflicts and went to make a cup of tea. By the time I was back: con