diff --git a/lib/utils/extraFile.d.ts b/lib/utils/extraFile.d.ts
index 2f29e37b1..86bd42390 100644
--- a/lib/utils/extraFile.d.ts
+++ b/lib/utils/extraFile.d.ts
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 import { OpSchema as ExtraFile } from '../base-app-domain/ExtraFile/Schema';
+=======
+import { OpSchema as ExtraFile } from 'oak-app-domain/ExtraFile/Schema';
+>>>>>>> 29abd56e063b345c3d535d45f7926ddc2d0e7f9f
 export declare function composeFileUrl(extraFile: ExtraFile): string;
 export declare function decomposeFileUrl(url: string): Pick<ExtraFile, 'bucket' | 'filename' | 'origin' | 'type' | 'extra1'>;
diff --git a/src/utils/extraFile.ts b/src/utils/extraFile.ts
index be9a549e0..aad4d27c3 100644
--- a/src/utils/extraFile.ts
+++ b/src/utils/extraFile.ts
@@ -1,4 +1,4 @@
-import { OpSchema as ExtraFile } from '../base-app-domain/ExtraFile/Schema';
+import { OpSchema as ExtraFile } from 'oak-app-domain/ExtraFile/Schema';
 
 export function composeFileUrl(extraFile: ExtraFile) {
     const { type, bucket, filename, origin, extra1 } = extraFile;