Upstream merge requires manual conflict resolution

[github-actions]

The scheduled upstream merge found conflicts.

• Branch: chore/upstream-merge-20260701
• Action did not create a PR to avoid committing conflicts.

Steps:

1. Pull the branch locally
2. Resolve conflicts (your .gitattributes should protect custom paths)
3. Push and open a PR