The merge moved tagged lines in identity.rs, identity_ui.rs and the two
Slint files; the matrix tracks line numbers, so it goes stale on a move
alone. A merge commit does not run the pre-commit hook that would
normally have staged this.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>