🚨 Branch Sync Conflict: main → next

[github-actions]

Automatic Branch Sync Failed

A merge conflict was detected when attempting to sync changes from main to next branch.

Trigger Commit: f62052c
Workflow Run: 16419793318

Manual Resolution Required

Please follow these steps to resolve the conflict:

1. Create a new branch from next:

   git checkout next
   git pull origin next
   git checkout -b sync-main-to-next-manual

2. Merge main and resolve conflicts:

   git merge main
   # Resolve any conflicts in your editor
   git add .
   git commit

3. Create a Pull Request:

   git push origin sync-main-to-next-manual
   # Then create a PR from sync-main-to-next-manual to next

4. Close this issue once the sync PR is merged.

Files Likely to Have Conflicts

Check these common conflict areas:

• package.json (version numbers)
• CHANGELOG.md (release notes)
• Configuration files
• Documentation updates

---

This issue was automatically created by the Sync Main to Next workflow.