Merge upstream/main, resolve README conflict

fengyat committed Jun 3, 2026 at 10:49 UTC a5a88040dde441306d01b25791b843a3235fc8c3

No changes.