Re-add merge conflct text

index.bs

@@ -6123,6 +6123,12 @@ a numbered step. If outdented, it (today) is rendered as a bullet in the midst o
     and continue the [=registration ceremony=] as appropriate.
     Otherwise, fail the [=registration ceremony=].
 
+    If the [=[RP]=] does not fail the [=registration ceremony=] in this case,
+    then the [=[RP]=] is accepting that there is no cryptographic proof
+    that the [=public key credential=] has been generated by any particular [=authenticator=] model.
+    The [=[RP]=] MAY consider the credential as equivalent to one with [=None|no attestation=] (see [[#sctn-attestation-types]]).
+    See [[FIDOSecRef]] and [[UAFProtocol]] for a more detailed discussion.
+
     Verification of [=attestation objects=] requires that the [=[RP]=] has a trusted method of determining acceptable trust anchors
     in [step 22](#reg-ceremony-attestation-trust-anchors) above.
     Also, if certificates are being used, the [=[RP]=] MUST have access to certificate status information for the