Resolved merge conflicts

index.bs

@@ -657,6 +657,7 @@ When this method is invoked, the user agent MUST execute the following algorithm
         1. Otherwise, [=list/Append=] |C| to |excludeCredentialDescriptorList|.
     1. [=In parallel=], invoke the [=authenticatorMakeCredential=] operation on |authenticator| with |rpId|,
         |clientDataHash|, |options|.{{MakePublicKeyCredentialOptions/rp}}, |options|.{{MakePublicKeyCredentialOptions/user}},
+        <code>|options|.{{MakePublicKeyCredentialOptions/authenticatorSelection}}.{{AuthenticatorSelectionCriteria/requireResidentKey}}</code>,
         |normalizedParameters|, |excludeCredentialDescriptorList|, and |authenticatorExtensions| as parameters.
     1. [=set/Append=] |authenticator| to |issuedRequests|.
 
@@ -1565,9 +1566,9 @@ input parameters:
     preferred. The platform makes a best-effort to create the most preferred credential that it can.
 - An optional list of {{PublicKeyCredentialDescriptor}} objects provided by the [=[RP]=] with the intention that, if any of
     these are known to the authenticator, it should not create a new credential.
-- Extension data created by the client based on the extensions requested by the [=[RP]=], if any.
 - The |requireResidentKey| parameter of the |options|.{{MakePublicKeyCredentialOptions/authenticatorSelection}} dictionary.
 - The |requireUserVerification| parameter of the |options|.{{MakePublicKeyCredentialOptions/authenticatorSelection}} dictionary.
+- Extension data created by the client based on the extensions requested by the [=[RP]=], if any.
 
 When this operation is invoked, the authenticator must perform the following procedure:
 - Check if all the supplied parameters are syntactically well-formed and of the correct length. If not, return an error code
@@ -3261,11 +3262,11 @@ The sample code for generating and registering a new key follows:
       pubKeyCredParams: [
         {
           type: "public-key",
-          algorithm: "ES256",
+          alg: "ES256",
         },
         {
           type: "public-key",
-          algorithm: "RS256",
+          alg: "RS256",
         }
       ],