fix: merge errors

plugins/catalog-backend/src/service/standaloneApplication.ts

@@ -27,7 +27,6 @@ import { Logger } from 'winston';
 import { EntitiesCatalog, LocationsCatalog } from '../catalog';
 import { HigherOrderOperation } from '../ingestion';
 import { createRouter } from './router';
-import { HigherOrderOperation } from '../ingestion/types';
 
 export interface ApplicationOptions {
   enableCors: boolean;

plugins/catalog-backend/src/service/standaloneServer.ts

@@ -15,7 +15,7 @@
  */
 
 import { Server } from 'http';
-import { Logger } from 'winston';
+import { Logger, log } from 'winston';
 import knex from 'knex';
 import { createStandaloneApplication } from './standaloneApplication';
 import { DatabaseEntitiesCatalog } from '../catalog/DatabaseEntitiesCatalog';
@@ -49,6 +49,7 @@ export async function startStandaloneServer(
     entitiesCatalog,
     locationsCatalog,
     ingestionModel,
+    logger,
   );
 
   logger.debug('Creating application...');