Build fixes

Author: MarkDuckworth

packages/firestore/src/api/reference_impl.ts

@@ -58,11 +58,9 @@ import {
   parseUpdateData,
   parseUpdateVarargs
 } from '../lite-api/user_data_reader';
-import { AbstractUserDataWriter } from '../lite-api/user_data_writer';
 import { DocumentKey } from '../model/document_key';
 import { DeleteMutation, Mutation, Precondition } from '../model/mutation';
 import { debugAssert } from '../util/assert';
-import { ByteString } from '../util/byte_string';
 import { Code, FirestoreError } from '../util/error';
 import { cast } from '../util/input_validation';
 
@@ -73,6 +71,7 @@ import {
   QuerySnapshot,
   SnapshotMetadata
 } from './snapshot';
+import {ExpUserDataWriter} from "./user_data_writer";
 
 /**
  * An options object that can be passed to {@link (onSnapshot:1)} and {@link

packages/performance/src/resources/web_vitals.ts

@@ -15,19 +15,6 @@
  * limitations under the License.
  */
 
-<<<<<<<< HEAD:e2e/jest.config.ts
-import type { Config } from 'jest';
-
-const config: Config = {
-  verbose: true,
-  testEnvironment: './fix-jsdom-environment.ts',
-  globals: {
-    FIREBASE_APPCHECK_DEBUG_TOKEN: process.env.APP_CHECK_DEBUG_TOKEN
-  }
-};
-
-export default config;
-========
 export interface CoreVitalMetric {
   value: number;
   elementAttribution?: string;
@@ -38,4 +25,3 @@ export interface WebVitalMetrics {
   inp?: CoreVitalMetric;
   lcp?: CoreVitalMetric;
 }
->>>>>>>> 86155b3c8f3974f8d777232625108c14f924e035:packages/performance/src/resources/web_vitals.ts