Fix build error due to spurious content on IDR page

Signed-off-by: Steven Capell <[email protected]>

website/docs/specification/IdentityResolver.md

@@ -46,29 +46,17 @@ An identifier is nothing more than a string of characters. In isolation, it has
 
 Decentralised Identifiers *resolve* to a "DID Document" - a small piece of data that includes the public cryptographic key for the DID's controller and, optionally, a list of services related to that identitifier. At the time of writing, the established method for DID resolution is being formally standardised at W3C. An app is needed to recognise and resolve a DID, and to process the returned DID Document.
 
-<<<<<<< Updated upstream
 ISO/IEC (FDIS) 18975 defines a framework for resolving any existing identifier that is globally unique in its own right, most notably, those issued under the ISO/IEC 15459 series. It sets out two options for how those identifiers can be encoded in a regular HTTP URI (Web addrress), using Data Identifiers and Application Identifiers, and how that URI can resolve to a set of links to information about the identified entity. That [linkset](https://datatracker.ietf.org/doc/rfc9264/) can be operationalised in a resolver. This defines a framework for creating a simple query interface for any identified entity. ISO/IEC 18975 enables identity issuing agencies to develop conformant standards that specify the following:
 * The identifiers can be encoded in a URL within a QR Code printed on a product that can be scanned just using a mobile phone's camera, without any need for a specialist app. The user can select the DPP from the list of available links to information (i.e. manually select the correct link from the linkset).
 * The identifiers can be encoded in a URL within a QR Code printed on a product that can be scanned using a specialist app that queries the resolver and returns the DPP.
-=======
+
+
 ### Link Resolver Services
 
 ISO/IEC (FDIS) 18975 defines a framework for resolving any existing identifier that is globally unique (notably those issued under the ISO/IEC 15459 series). It sets out two options for how those identifiers can be encoded in a regular HTTP URI (Web address), using Data Identifiers and Application Identifiers, and how that URI can resolve to a set of links (a "link-set") to information about the identified entity. That [link-set](https://datatracker.ietf.org/doc/rfc9264/) can be operationalised in a resolver service. This defines a framework for creating a simple query interface for any identified entity. 
 
 TBD - link query examples and linkset response examples.
 
-```mermaid
-erDiagram
-          CUSTOMER }|..|{ DELIVERY-ADDRESS : has
-          CUSTOMER ||--o{ ORDER : places
-          CUSTOMER ||--o{ INVOICE : "liable for"
-          DELIVERY-ADDRESS ||--o{ ORDER : receives
-          INVOICE ||--|{ ORDER : covers
-          ORDER ||--|{ ORDER-ITEM : includes
-          PRODUCT-CATEGORY ||--|{ PRODUCT : contains
-          PRODUCT ||--o{ ORDER-ITEM : "ordered in"
-```
-
 ### URNs to link-Set
 
 The UN global trust register will include resolver templates for each scheme and so the UNTP requirement that identifiers be resolvable is met by substituting the URN `{identifier-value}` into the `{id}` placeholder in the resolver template related to the matching `{identifier-scheme}`. For example
@@ -106,9 +94,6 @@ TBD - how to represent links to API's or services that will accept create/update
 ### Secure Targets
 
 TBD - how to represent links that require authenticated access or decryption keys?
->>>>>>> Stashed changes
-
-The [GS1 Digital Link](https://ref.gs1.org/standards/digital-link/uri-syntax/) and [GS1-Conformant resolver](https://ref.gs1.org/standards/resolver/) standards conform to ISO/IEC (FDIS) 18975.
 
 ## Verifiability