diff --git a/src/ocean/Assets.ts b/src/ocean/Assets.ts
index b714487b..607737a3 100644
--- a/src/ocean/Assets.ts
+++ b/src/ocean/Assets.ts
@@ -393,11 +393,17 @@ export class Assets extends Instantiable {
     return {
       type: 'access',
       index: 2,
+<<<<<<< HEAD
 <<<<<<< HEAD
       serviceEndpoint: customProvider || this.ocean.provider.url,
 =======
       serviceEndpoint: customProvider || this.ocean.provider.getConsumeEndpoint(),
 >>>>>>> 17e61d0... allow customProvider on publish
+=======
+      serviceEndpoint: customProvider
+        ? customProvider + this.ocean.provider.getConsumeEndpointShort()
+        : this.ocean.provider.getConsumeEndpoint(),
+>>>>>>> 960e90f... extra checks
       attributes: {
         main: {
           creator: creator.getId(),
diff --git a/src/ocean/Compute.ts b/src/ocean/Compute.ts
index dcc1a4e9..5b3903b5 100644
--- a/src/ocean/Compute.ts
+++ b/src/ocean/Compute.ts
@@ -293,6 +293,7 @@ export class Compute extends Instantiable {
     const service = {
       type: 'compute',
       index: 3,
+<<<<<<< HEAD
 <<<<<<< HEAD
       serviceEndpoint: customProvider
         ? customProvider + this.ocean.provider.getComputeEndpointShort()
@@ -300,6 +301,11 @@ export class Compute extends Instantiable {
 =======
       serviceEndpoint: customProvider || this.ocean.provider.getComputeEndpoint(),
 >>>>>>> 17e61d0... allow customProvider on publish
+=======
+      serviceEndpoint: customProvider
+        ? customProvider + this.ocean.provider.getComputeEndpointShort()
+        : this.ocean.provider.getComputeEndpoint(),
+>>>>>>> 960e90f... extra checks
       attributes: {
         main: {
           name,