Checkpoint: 2025-08-07 13:13

Task: merge with main, there are merge conflicts.

Checkpoint Details

• Branch: main
• Commit: 43df8af
• Files changed: 1411 files

Rollback Instructions

# To rollback to this checkpoint:
git checkout task-20250807-131309