From 6c43a72474bf9c40be8b053de1baa1e12f8e6d07 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Tue, 17 Mar 2020 13:07:54 +0200
Subject: [PATCH] fix conflict

---
 test/integration/ocean/Compute.test.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/integration/ocean/Compute.test.ts b/test/integration/ocean/Compute.test.ts
index cdb561c..9111381 100644
--- a/test/integration/ocean/Compute.test.ts
+++ b/test/integration/ocean/Compute.test.ts
@@ -1,8 +1,16 @@
 import { assert } from 'chai'
 
 import { config } from '../config'
-import { Ocean, Account, DDO, MetaData, ComputeJobStatus, Config } from '../../../src'
-import { getMetadata } from '../utils'
+import {
+    Ocean,
+    Account,
+    DDO,
+    MetaData,
+    ComputeJobStatus,
+    Config,
+    MetaDataAlgorithm
+} from '../../../src'
+import { getMetadata, createComputeService } from '../utils'
 import { ServiceCompute } from '../../../src/ddo/Service'
 
 const metadataAsset = getMetadata()