chore: fix up some minor git conflicts

Author: mint-dewit

packages/webui/src/client/ui/PreviewPopUp/PreviewPopUpContext.tsx

@@ -16,7 +16,7 @@ import {
 	VTContent,
 } from '@sofie-automation/blueprints-integration'
 import { ReadonlyDeep, ReadonlyObjectDeep } from 'type-fest/source/readonly-deep'
-import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
+import { PieceContentStatusObj } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus'
 import { ITranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import _ from 'underscore'
 import { IAdLibListItem } from '../Shelf/AdLibListItem'

packages/webui/src/client/ui/RundownView.tsx

@@ -90,7 +90,7 @@ import {
 } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { VirtualElement } from '../lib/VirtualElement'
 import { SEGMENT_TIMELINE_ELEMENT_ID } from './SegmentTimeline/SegmentTimeline'
-import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
+import { Bucket } from '@sofie-automation/corelib/dist/dataModel/Bucket'
 import { contextMenuHoldToDisplayTime, isEventInInputField } from '../lib/lib'
 import { OffsetPosition } from '../utils/positions'
 import { MeteorCall } from '../lib/meteorApi'

packages/webui/src/client/ui/SegmentTimeline/SourceLayerItem.tsx

@@ -21,7 +21,7 @@ import { TransitionSourceRenderer } from './Renderers/TransitionSourceRenderer'
 import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { ReadonlyDeep } from 'type-fest'
 import { useSelectedElementsContext } from '../RundownView/SelectedElementsContext'
-import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
+import { PieceContentStatusObj } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus'
 import { useCallback, useRef, useState, useEffect, useContext } from 'react'
 import {
 	convertSourceLayerItemToPreview,