chore: merge conflicts

Author: Julusian

packages/blueprints-integration/src/api/studio.ts

@@ -117,17 +117,6 @@ export interface StudioBlueprintManifest<TRawConfig = IBlueprintConfig, TProcess
 	 * If this method is not defined the config object will be used directly
 	 */
 	blueprintConfigToAPI?: (context: ICommonContext, config: TRawConfig) => object
-
-	/**
-	 * Process an ingest operation, to apply changes to the sofie interpretation of the ingest data
-	 */
-	processIngestData?: (
-		context: IProcessIngestDataContext,
-		mutableIngestRundown: MutableIngestRundown<any, any, any>,
-		nrcsIngestRundown: IngestRundown,
-		previousNrcsIngestRundown: IngestRundown | undefined,
-		changes: NrcsIngestChangeDetails | UserOperationChange
-	) => Promise<void>
 }
 
 export interface BlueprintResultStudioBaseline {

packages/job-worker/src/ingest/mosDevice/__tests__/mosIngest.test.ts

@@ -543,9 +543,7 @@ describe('Test recieved mos ingest payloads', () => {
 				replace: false,
 			})
 		).rejects.toThrow(
-			`Part ${getMosIngestSegmentId(mosTypes.mosString128.stringify(beforeStoryId))} in rundown ${
-				rundown.externalId
-			} not found`
+			`Part ${mosTypes.mosString128.stringify(beforeStoryId)} in rundown ${rundown.externalId} not found`
 		)
 
 		expect(
@@ -677,9 +675,7 @@ describe('Test recieved mos ingest payloads', () => {
 				replace: true,
 			})
 		).rejects.toThrow(
-			`Part ${getMosIngestSegmentId(mosTypes.mosString128.stringify(beforeStoryId))} in rundown ${
-				rundown.externalId
-			} not found`
+			`Part ${mosTypes.mosString128.stringify(beforeStoryId)} in rundown ${rundown.externalId} not found`
 		)
 
 		expect(

packages/job-worker/src/playout/quickLoopMarkers.ts

@@ -10,7 +10,6 @@ import { QuickLoopMarker, QuickLoopMarkerType } from '@sofie-automation/corelib/
 import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PlayoutModel } from './model/PlayoutModel'
 import { clone } from 'underscore'
-import { PlayoutModel } from './model/PlayoutModel'
 
 export async function handleSetQuickLoopMarker(context: JobContext, data: SetQuickLoopMarkerProps): Promise<void> {
 	return runJobWithPlayoutModel(

packages/live-status-gateway/src/topics/activePlaylistTopic.ts

@@ -24,8 +24,6 @@ import { SegmentHandler } from '../collections/segmentHandler'
 import { SegmentsHandler } from '../collections/segmentsHandler'
 import { normalizeArray } from '@sofie-automation/corelib/dist/lib'
 import { PlaylistTimingType } from '@sofie-automation/blueprints-integration'
-import { SegmentsHandler } from '../collections/segmentsHandler'
-import { normalizeArray } from '@sofie-automation/corelib/dist/lib'
 
 const THROTTLE_PERIOD_MS = 100
 

packages/meteor-lib/src/api/pubsub.ts

@@ -2,6 +2,7 @@ import {
 	BucketId,
 	OrganizationId,
 	PartId,
+	RundownId,
 	RundownPlaylistActivationId,
 	RundownPlaylistId,
 	ShowStyleBaseId,