Merge conflicted fourslash tests

Author: RyanCavanaugh

tests/baselines/reference/tsserver/fourslashServer/autoImportReExportFromAmbientModule.js

@@ -1,12 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
-<<<<<<< HEAD
 // @Filename: /home/src/workspaces/project/tsconfig.json
-//// { "compilerOptions": { "module": "preserve", "types": ["*"] } }
-=======
-// @lib: es5
-// @module: preserve
->>>>>>> upstream/main
+//// { "compilerOptions": { "lib": "es5", "module": "preserve", "types": ["*"] } }
 
 // @Filename: /home/src/workspaces/project/node_modules/@types/node/index.d.ts
 //// declare module "node:fs" {

tests/baselines/reference/tsserver/fourslashServer/importNameCodeFix_pnpm1.js

@@ -4,11 +4,8 @@
 //// {
 ////   "compilerOptions": {
 ////     "module": "commonjs",
-<<<<<<< HEAD
-////     "types": ["*"]
-=======
+////     "types": ["*"],
 ////     "lib": ["es5"]
->>>>>>> upstream/main
 ////   }
 //// }
 

tests/baselines/reference/tsserver/fourslashServer/importStatementCompletions_pnpm1.js

@@ -1,11 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-<<<<<<< HEAD
-//// { "compilerOptions": { "module": "commonjs", "types": ["*"] } }
-=======
-//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
->>>>>>> upstream/main
+//// { "compilerOptions": { "module": "commonjs", "types": ["*"], "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/node_modules/.pnpm/@[email protected]/node_modules/@types/react/index.d.ts
 //// export declare function Component(): void;

tests/cases/fourslash/server/autoImportPackageJsonFilterExistingImport3.ts

@@ -1,11 +1,7 @@
 /// <reference path="../fourslash.ts" />
 
 // @Filename: /home/src/workspaces/project/tsconfig.json
-<<<<<<< HEAD
-//// { "compilerOptions": { "module": "commonjs", "types": ["*"] } }
-=======
-//// { "compilerOptions": { "module": "commonjs", "lib": ["es5"] } }
->>>>>>> upstream/main
+//// { "compilerOptions": { "module": "commonjs", "types": ["*"], "lib": ["es5"] } }
 
 // @Filename: /home/src/workspaces/project/node_modules/.pnpm/@[email protected]/node_modules/@types/react/index.d.ts
 //// export declare function Component(): void;