fix: resolved conflicts from merge

Author: fmarino-ipzs

docs/en/plantuml/rp-mobile-instance-access-certificate-issuance.puml

@@ -5,7 +5,7 @@ hide footbox
 'Participants
 actor "User" as user
 participant "Mobile Relying Party Instance" as app 
-participant "Key Attestation APIs" as aats #springgreen
+participant "Device Integrity Service API" as aats #springgreen
 participant "Relying Party Backend" as bck
 participant "Relying Party Instance\nAccess Certificate Authority" as ca
 
@@ -25,7 +25,7 @@ app->app: Generate ""client_data"" and\ncompute ""client_data_hash""
 app->aats: ""client_data_hash""
 activate aats
 
-aats-->app: ""key_attestation""
+aats-->app: ""integrity_assertion""
 deactivate aats
 
 app->app: Generate ""hardware_signature""

docs/en/plantuml/wallet-attestation-issuance.puml

@@ -5,7 +5,7 @@ hide footbox
 
 actor "User" as user
 participant "Wallet Instance" as app 
-participant "Key Attestation APIs" as aats #springgreen
+participant "Device Integrity Service APIs" as aats #springgreen
 participant "Wallet Provider backend" as bck
 
 
@@ -36,17 +36,17 @@ app->app: Generate ""client_data_hash"" as SHA256(""nonce"", ""ephemeral_key_pub
 app->app: Generate Cryptographic Hardware Key PoP\n""hardware_signature"" = sign((""client_data_hash"", ""hardware_key_tag""), ""hardware_key_priv"")
 
 app->aats: ""client_data_hash""
-aats-->app: ""key_attestation""
+aats-->app: ""integrity_assertion""
 
-app->app: Generate Wallet Attestation Request with ""key_attestation"", ""hardware_signature"", ""nonce"",\n""hardware_key_tag"", ""ephemeral_key_pub"" signed with ephemeral ""ephemeral_key_priv""
+app->app: Generate Wallet Attestation Request with ""integrity_assertion"", ""hardware_signature"", ""nonce"",\n""hardware_key_tag"", ""ephemeral_key_pub"" signed with ephemeral ""ephemeral_key_priv""
 app->bck: Send Wallet Attestation Request
 activate bck
 rnote over bck,bck #LIGHTGREEN
 Check if Wallet Instance is initialized and valid
 using ""hardware_key_tag""
 endrnote
 bck->bck: Validate ""nonce""
-bck->bck: Validate ""key_attestation""
+bck->bck: Validate ""integrity_assertion""
 bck->bck: Validate ""hardware_signature""
 bck->bck: Validate ""ephemeral_key_pub"" PoP
 bck->bck: Create Wallet Attestation