Conflict diffs, Syncthing conflict copies, recovery versions !99

merged merged by cmc on 2026-10-06 05:47 UTC · krz/orgstar:versions into main