bug: stash pop conflict after squash merge leaves UU files, blocking all subsequent milestone merges (phases.ts silently swallows GSDError and advances to next milestone)