478db5183a
- Added conflictCount metadata and warning badge output to read results for files with unresolved conflicts. - Added conflict detection parsing with strict marker matching and session-scoped conflict IDs. - Added write-path conflict resolution for `conflict://N` using token expansion and marker validation before splicing. - Added unit and integration tests for conflict scanning, history lifecycle, URI validation, and workflows.