diff --git a/index.html b/index.html
index bce8af4..b1f8c2a 100644
--- a/index.html
+++ b/index.html
@@ -576,14 +576,14 @@ <h3>DID Resolution Options</h3>
 				accept
 			</dt>
 			<dd>
-				The Media Type of the caller's preferred <a>representation</a> of the <a>DID
-				document</a>. The Media Type MUST be expressed as an <a data-lt="ascii
-string">ASCII string</a>. The <a>DID resolver</a> implementation SHOULD use this
-				value to determine the <a>representation</a> of the returned
-				<code>didDocument</code> if such a <a>representation</a> is supported and
-				available. Any <a>representation</a> MUST be able to be translated into
-				the representation defined by the <code>application/did</code> mediaType. 
-				This property is OPTIONAL.
+				The media type of the caller's preferred <a>representation</a> of the
+				<a>DID document</a>. The value MUST be expressed according to the
+				`Accept` header value as defined in [[[RFC9110]]], <a
+				data-cite="RFC9110#section-12.5.1">Section 12.5.1</a>. The <a>DID
+				resolver</a> implementation SHOULD use this value to determine the
+				<a>representation</a> of the returned
+				<code>didDocument</code> if such a <a>representation</a> is supported
+				and available. This property is OPTIONAL.
 			</dd>
 		</dl>
 
@@ -1188,11 +1188,13 @@ <h3>DID URL Dereferencing Options</h3>
 				accept
 			</dt>
 			<dd>
-				The Media Type that the caller prefers for <code>contentStream</code>. The Media
-				Type MUST be expressed as an <a data-lt="ascii string">ASCII string</a>. The
-				<a>DID URL dereferencer</a> implementation SHOULD use this value to determine
-				the <code>contentType</code> of the <a>representation</a> contained in the
-				returned value if such a <a>representation</a> is supported and available.
+				The media type that the caller prefers for <code>contentStream</code>.
+				The value MUST be expressed according to the `Accept` header value as
+				defined in [[[RFC9110]]], <a data-cite="RFC9110#section-12.5.1">Section
+				12.5.1</a>. The <a>DID URL dereferencer</a> implementation SHOULD use
+				this value to determine the <code>contentType</code> of the
+				<a>representation</a> contained in the returned value if such a
+				<a>representation</a> is supported and available.
 			</dd>
 		</dl>
 		<dl>
@@ -1622,11 +1624,7 @@ <h2>Metadata Structure</h2>
 			<a data-cite="INFRA#sets">set</a>,
 		<a data-cite="INFRA#boolean">boolean</a>, or
 		<a data-cite="INFRA#nulls">null</a>. The values within any complex data
-<<<<<<< HEAD
-		structure such as a map or list MUST be one of these data types as well.
-=======
 		structure such as a map or list MUST also be one of these data types.
->>>>>>> 526ac87 (Apply suggestions from code review)
 		The entire metadata structure MUST be serializable according to the <a
 			data-cite="INFRA#serialize-an-infra-value-to-json-bytes">JSON
 		serialization rules</a> in the [[INFRA]] specification. Implementations MAY