Show HN: Merge folders and simulate merging–count of conflicts, trumps, and new | Heykuki News