> I haven't found anything else that touches it.

Have Claude Code resolve merge conflicts, problem solved.