Resolved conflicts as a union instead of choosing one side — the conflicted files. Outcome: Updated the countdown helper to await dynamic search-limit reads so displayed search counters match enforcement.

88545d0e-81c2-45e2-873f-371d3a6e0fe7