conflicts: converge divergent edits via contested-freeze, notify both edges (#158)#180

mbertschler merged 3 commits into

claude/issue-157-run-rows-standing-statesmbertschler/squirrel:claude/issue-157-run-rows-standing-statesfrom

claude/issue-158-contested-freezembertschler/squirrel:claude/issue-158-contested-freezeCopy head branch name to clipboard