resolve merge conflict

Author: Kristina Yasuda

openid4vc-high-assurance-interoperability-profile-1_0.md

@@ -96,10 +96,14 @@ defined in [@ISO.18013-7]. For more details, also see Annex B.3 in [@!OIDF.OID4V
 
 ## Standards Requirements
 
+<<<<<<< HEAD
 This specification enables interoperable implementations of the following flows:
+=======
+This specification enables interoperable implementation of the following four flows:
+>>>>>>> 6a38c23 (Apply editorial suggestions from Joseph's code review)
 
 * Issuance of IETF SD-JWT VC using OpenID4VCI
-* Presentation of IETF SD-JWT VC using OpenID4VP
+* Presentation of IETF SD-JWT VC using OpenID4VP without using W3C Digital Credentials API
 * Presentation of IETF SD-JWT VC using OpenID4VP over W3C Digital Credentials API
 * Presentation of ISO mdocs using OpenID4VP over W3C Digital Credentials API
 
@@ -206,9 +210,13 @@ This is an example of a Wallet Instance Attestation:
 
 * The Credential Issuer MUST publish a mapping of every Credential Type it supports to a scope value.
 
+<<<<<<< HEAD
 # OpenID for Verifiable Presentations profile for IETF SD-JWT VC
 
 Requirements for both the Wallet and the Verifier:
+=======
+# OpenID for Verifiable Presentations profile for SD-JWT VC without using W3C Digital Credentials API
+>>>>>>> 6a38c23 (Apply editorial suggestions from Joseph's code review)
 
    * As a way to invoke the Wallet, at least a custom URL scheme `haip://` MUST be supported. Implementations MAY support other ways to invoke the wallets as agreed by trust frameworks/ecosystems/jurisdictions, not limited to using other custom URL schemes.
    * Response type MUST be `vp_token`.