Fix merge conflicts

Author: jcobis

packages/compass-collection/src/components/mock-data-generator-modal/mock-data-generator-modal.spec.tsx

@@ -6,7 +6,6 @@ import {
   waitFor,
   userEvent,
   waitForElementToBeRemoved,
-  waitForElementToBeRemoved,
 } from '@mongodb-js/testing-library-compass';
 import { Provider } from 'react-redux';
 import { createStore, applyMiddleware } from 'redux';

packages/compass-collection/src/components/mock-data-generator-modal/script-generation-utils.ts

@@ -1,7 +1,5 @@
 import type { MongoDBFieldType } from '@mongodb-js/compass-generative-ai';
 import type { FakerFieldMapping } from './types';
-import type { MongoDBFieldType } from '@mongodb-js/compass-generative-ai';
-import type { FakerFieldMapping } from './types';
 
 export type FakerArg = string | number | boolean | { json: string };