- Add Token class and token() helper in template package for JSX token support
- Refactor insertFragmentWithConflictResolution to detectFragmentTokenConflicts
- Refactor insertPageWithConflictResolution to detectPageTokenConflicts
- Move dialog display to callers for better testability
- Add conflictResolution parameter to page-utils
- Add comprehensive tests for token functionality and conflict detection
- Fix bug: remove .values() call on arrays in breakpoint handling

kof changed the title fox: Add token conflict detection and resolution for marketplace templates feat: Add token conflict detection and resolution for marketplace templates

kof deleted the mrkt-confl branch