fix: conflicts

CHANGELOG.md

@@ -66,10 +66,18 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - feat: subscription by credits api [`f97aa61`](https://github.com/nevermined-io/sdk-js/commit/f97aa61c4328a7bc8ea1f14f584b3664876970db)
 - chore: adapting nft 1155 to duration and transfer params [`a133315`](https://github.com/nevermined-io/sdk-js/commit/a133315c8b217cec7d41e6f863277dfe94fce98a)
 
-#### [v2.0.0-rc2](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc11...v2.0.0-rc2)
+#### [v2.0.0-rc2](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc12...v2.0.0-rc2)
 
 > 26 July 2023
 
+#### [v2.0.0-rc12](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc11...v2.0.0-rc12)
+
+> 3 October 2023
+
+- fix: adaptations and tests for NVM App 1155 flows [`e97c3ac`](https://github.com/nevermined-io/sdk-js/commit/e97c3acfb5b80d22aca29328e92f2c9f66a153bd)
+- test: fix services e2e services flow [`f93664d`](https://github.com/nevermined-io/sdk-js/commit/f93664d07747e6e714f43d51ccf4d5184e3201fe)
+- chore: adding v2.0.0-rc11 Changelog updates [`222bec9`](https://github.com/nevermined-io/sdk-js/commit/222bec960167fa95caabcff30d29fef68623332a)
+
 #### [v2.0.0-rc11](https://github.com/nevermined-io/sdk-js/compare/v2.0.0-rc10...v2.0.0-rc11)
 
 > 3 October 2023

integration/external/Datasets.e2e.test.ts

@@ -352,6 +352,7 @@ describe('Gate-keeping of Dataset using NFT ERC-721 End-to-End', () => {
       const result = await nevermined.search.subscriptionsPurchased(
         subscriber,
         NeverminedNFT721Type.nft721Subscription,
+        721,
       )
       assert.isAbove(result.totalResults.value, 1)
 
@@ -391,6 +392,7 @@ describe('Gate-keeping of Dataset using NFT ERC-721 End-to-End', () => {
       const result = await nevermined.search.subscriptionsPurchased(
         subscriber,
         NeverminedNFT721Type.nft721Subscription,
+        721,
         tagsFilter,
       )
       assert.isAbove(result.totalResults.value, 1)
@@ -408,6 +410,7 @@ describe('Gate-keeping of Dataset using NFT ERC-721 End-to-End', () => {
       const result = await nevermined.search.subscriptionsPurchased(
         subscriber,
         NeverminedNFT721Type.nft721Subscription,
+        721,
         tagsFilter2,
       )
       assert.equal(result.totalResults.value, 0)