Fix merge conflict

Signed-off-by: Nicko Guyer <[email protected]>

Author: nguyer

doc-site/docs/tutorials/tokens/erc721.md

@@ -28,14 +28,10 @@ After your stack is up and running, the first thing you need to do is create a t
 If you're using the default ERC-20 / ERC-721 token connector and its sample token factory, it will automatically deploy a new ERC-721 contract instance.
 
 #### Request
-<<<<<<< HEAD:docs/tutorials/tokens/erc721.md
-`POST` `http://127.0.0.1:5000/api/v1/namespaces/default/tokens/pools?publish=true`
 
-> *NOTE*: Without passing the query parameter `publish=true` when the token pool is created, it will initially be unpublished and not broadcasted to other members of the network (if configured in multi-party). To publish the token pool, a subsequent API call would need to be made to `/tokens/pools/{nameOrId}/publish`
-=======
+`POST` `http://127.0.0.1:5000/api/v1/namespaces/default/tokens/pools?publish=true`
 
-`POST` `http://127.0.0.1:5000/api/v1/namespaces/default/tokens/pools`
->>>>>>> main:doc-site/docs/tutorials/tokens/erc721.md
+> _NOTE_: Without passing the query parameter `publish=true` when the token pool is created, it will initially be unpublished and not broadcasted to other members of the network (if configured in multi-party). To publish the token pool, a subsequent API call would need to be made to `/tokens/pools/{nameOrId}/publish`
 
 ```json
 {
@@ -48,19 +44,6 @@ If you're using the default ERC-20 / ERC-721 token connector and its sample toke
 
 ```json
 {
-<<<<<<< HEAD:docs/tutorials/tokens/erc721.md
-    "id": "a92a0a25-b886-4b43-931f-4add2840258a",
-    "type": "nonfungible",
-    "namespace": "default",
-    "name": "nfts",
-    "key": "0x14ddd36a0c2f747130915bf5214061b1e4bec74c",
-    "connector": "erc20_erc721",
-    "tx": {
-        "type": "token_pool",
-        "id": "00678116-89d2-4295-990c-bd5ffa6e2434"
-    },
-    "published": true
-=======
   "id": "a92a0a25-b886-4b43-931f-4add2840258a",
   "type": "nonfungible",
   "namespace": "default",
@@ -70,8 +53,8 @@ If you're using the default ERC-20 / ERC-721 token connector and its sample toke
   "tx": {
     "type": "token_pool",
     "id": "00678116-89d2-4295-990c-bd5ffa6e2434"
-  }
->>>>>>> main:doc-site/docs/tutorials/tokens/erc721.md
+  },
+  "published": true
 }
 ```
 
@@ -124,14 +107,10 @@ See the [README](https://github.com/hyperledger/firefly-tokens-erc20-erc721/blob
 You can pass a `config` object with an `address` and `blockNumber` when you make the request to create the token pool, and if you created a contract interface, you can include the `interface` ID as well.
 
 #### Request
-<<<<<<< HEAD:docs/tutorials/tokens/erc721.md
-`POST` `http://127.0.0.1:5000/api/v1/namespaces/default/tokens/pools?publish=true`
 
-> *NOTE*: Without passing the query parameter `publish=true` when the token pool is created, it will initially be unpublished and not broadcasted to other members of the network (if configured in multi-party). To publish the token pool, a subsequent API call would need to be made to `/tokens/pools/{nameOrId}/publish`
-=======
+`POST` `http://127.0.0.1:5000/api/v1/namespaces/default/tokens/pools?publish=true`
 
-`POST` `http://127.0.0.1:5000/api/v1/namespaces/default/tokens/pools`
->>>>>>> main:doc-site/docs/tutorials/tokens/erc721.md
+> _NOTE_: Without passing the query parameter `publish=true` when the token pool is created, it will initially be unpublished and not broadcasted to other members of the network (if configured in multi-party). To publish the token pool, a subsequent API call would need to be made to `/tokens/pools/{nameOrId}/publish`
 
 ```json
 {