8e3b928bb0
Resolves add/add conflicts in .gitignore, config.yaml, pyproject.toml and content conflict in README.md — taking main's version in all cases, as it reflects the complete package rewrite (gallery/ package, TUI, CI pipeline). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>