Merge resolution staged as closing a zipper: two columns of timestamped edit ops, meshed by dragging a handle down the spine that physically jams at the first same-offset conflict until you pick a side.
npx shadcn@latest add https://design.helpmarq.com/r/zipper-stall.jsonzipper-stall