# Conflicts: # web/src/components/settings/PersonalSetting.jsx # web/src/i18n/locales/en.json # web/src/i18n/locales/zh.json
Merge branch 'main-upstream' into feature/passkey · e26c7947