widen active-editing window to 60s, skip duplication when
local item is clean, and check all existing conflicts not
just the first one

mentioned this pull request

alexanderadam changed the title fix: reduce spurious conflict duplicates fix: reduce potential conflict duplicates

cover the dirty-check shortcut, 60s active-editing window,
and multi-conflict dedup in Conflict delta