fn merge_signatures( user: &UserId, master_key: CrossSigningKey, our_raw: Result<Raw<CrossSigningKey>>, ) -> CrossSigningKey