# Conflicts:
#	src/compiler/diagnosticMessages.json
#	tests/baselines/reference/asyncYieldStarContextualType.types
#	tests/baselines/reference/awaitedType.types
#	tests/baselines/reference/contextuallyTypeAsyncFunctionReturnTypeFromUnion.types
#	tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.types
#	tests/baselines/reference/declarationEmitUsingAlternativeContainingModules1.types
#	tests/baselines/reference/declarationEmitUsingAlternativeContainingModules2.types
#	tests/baselines/reference/destructureOfVariableSameAsShorthand.types
#	tests/baselines/reference/esModuleInteropImportCall.types
#	tests/baselines/reference/genericFunctionInference1.types
#	tests/baselines/reference/importCallExpression1ES2020.types
#	tests/baselines/reference/importCallExpression2ES2020.types
#	tests/baselines/reference/importCallExpression4ES2020.types
#	tests/baselines/reference/importCallExpressionES5AMD.types
#	tests/baselines/reference/importCallExpressionES5CJS.types
#	tests/baselines/reference/importCallExpressionES5System.types
#	tests/baselines/reference/importCallExpressionES5UMD.types
#	tests/baselines/reference/importCallExpressionES6AMD.types
#	tests/baselines/reference/importCallExpressionES6CJS.types
#	tests/baselines/reference/importCallExpressionES6System.types
#	tests/baselines/reference/importCallExpressionES6UMD.types
#	tests/baselines/reference/importCallExpressionErrorInES2015.types
#	tests/baselines/reference/importCallExpressionInAMD1.types
#	tests/baselines/reference/importCallExpressionInAMD2.types
#	tests/baselines/reference/importCallExpressionInAMD4.types
#	tests/baselines/reference/importCallExpressionInCJS1.types
#	tests/baselines/reference/importCallExpressionInCJS3.types
#	tests/baselines/reference/importCallExpressionInCJS5.types
#	tests/baselines/reference/importCallExpressionInSystem1.types
#	tests/baselines/reference/importCallExpressionInSystem2.types
#	tests/baselines/reference/importCallExpressionInSystem4.types
#	tests/baselines/reference/importCallExpressionInUMD1.types
#	tests/baselines/reference/importCallExpressionInUMD2.types
#	tests/baselines/reference/importCallExpressionInUMD4.types
#	tests/baselines/reference/importCallExpressionNoModuleKindSpecified.types
#	tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types
#	tests/baselines/reference/importCallExpressionShouldNotGetParen.types
#	tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.types
#	tests/baselines/reference/inferenceLimit.types
#	tests/baselines/reference/instantiateContextualTypes.types
#	tests/baselines/reference/mappedTypesGenericTuples2.types
#	tests/baselines/reference/modularizeLibrary_Dom.asynciterable.types
#	tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
#	tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
#	tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
#	tests/baselines/reference/modularizeLibrary_Worker.asynciterable.types
#	tests/baselines/reference/moduleResolutionWithoutExtension5.types
#	tests/baselines/reference/moduleResolutionWithoutExtension8.types
#	tests/baselines/reference/privateNameMethodAsync.types
#	tests/baselines/reference/promisePermutations.types
#	tests/baselines/reference/promisePermutations2.types
#	tests/baselines/reference/promisePermutations3.types
#	tests/baselines/reference/promiseTest.types
#	tests/baselines/reference/promiseType.types
#	tests/baselines/reference/promiseTypeStrictNull.types
#	tests/baselines/reference/promiseVoidErrorCallback.types
#	tests/baselines/reference/promises.types
#	tests/baselines/reference/specializationError.types
#	tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.types
#	tests/baselines/reference/truthinessPromiseCoercion.types
#	tests/baselines/reference/unionAndIntersectionInference1.types
#	tests/baselines/reference/unionOfClassCalls.types

# Conflicts:
#	tests/baselines/reference/asyncYieldStarContextualType.types
#	tests/baselines/reference/awaitedType.types
#	tests/baselines/reference/contextuallyTypeAsyncFunctionReturnTypeFromUnion.types
#	tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.types
#	tests/baselines/reference/declarationEmitUsingAlternativeContainingModules1.types
#	tests/baselines/reference/declarationEmitUsingAlternativeContainingModules2.types
#	tests/baselines/reference/destructureOfVariableSameAsShorthand.types
#	tests/baselines/reference/es2018ObjectAssign.types
#	tests/baselines/reference/esModuleInteropImportCall.types
#	tests/baselines/reference/genericFunctionInference1.types
#	tests/baselines/reference/importCallExpression1ES2020.types
#	tests/baselines/reference/importCallExpression2ES2020.types
#	tests/baselines/reference/importCallExpression4ES2020.types
#	tests/baselines/reference/importCallExpressionES5AMD.types
#	tests/baselines/reference/importCallExpressionES5CJS.types
#	tests/baselines/reference/importCallExpressionES5System.types
#	tests/baselines/reference/importCallExpressionES5UMD.types
#	tests/baselines/reference/importCallExpressionES6AMD.types
#	tests/baselines/reference/importCallExpressionES6CJS.types
#	tests/baselines/reference/importCallExpressionES6System.types
#	tests/baselines/reference/importCallExpressionES6UMD.types
#	tests/baselines/reference/importCallExpressionErrorInES2015.types
#	tests/baselines/reference/importCallExpressionInAMD1.types
#	tests/baselines/reference/importCallExpressionInAMD2.types
#	tests/baselines/reference/importCallExpressionInAMD4.types
#	tests/baselines/reference/importCallExpressionInCJS1.types
#	tests/baselines/reference/importCallExpressionInCJS3.types
#	tests/baselines/reference/importCallExpressionInCJS5.types
#	tests/baselines/reference/importCallExpressionInSystem1.types
#	tests/baselines/reference/importCallExpressionInSystem2.types
#	tests/baselines/reference/importCallExpressionInSystem4.types
#	tests/baselines/reference/importCallExpressionInUMD1.types
#	tests/baselines/reference/importCallExpressionInUMD2.types
#	tests/baselines/reference/importCallExpressionInUMD4.types
#	tests/baselines/reference/importCallExpressionNoModuleKindSpecified.types
#	tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types
#	tests/baselines/reference/importCallExpressionShouldNotGetParen.types
#	tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.types
#	tests/baselines/reference/inferenceLimit.types
#	tests/baselines/reference/instantiateContextualTypes.types
#	tests/baselines/reference/mappedTypesGenericTuples2.types
#	tests/baselines/reference/modularizeLibrary_Dom.asynciterable.types
#	tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
#	tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
#	tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
#	tests/baselines/reference/modularizeLibrary_Worker.asynciterable.types
#	tests/baselines/reference/moduleResolutionWithoutExtension5.types
#	tests/baselines/reference/moduleResolutionWithoutExtension8.types
#	tests/baselines/reference/privateNameMethodAsync.types
#	tests/baselines/reference/promisePermutations.types
#	tests/baselines/reference/promisePermutations2.types
#	tests/baselines/reference/promisePermutations3.types
#	tests/baselines/reference/promiseTest.types
#	tests/baselines/reference/promiseType.types
#	tests/baselines/reference/promiseTypeStrictNull.types
#	tests/baselines/reference/promiseVoidErrorCallback.types
#	tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.types
#	tests/baselines/reference/truthinessPromiseCoercion.types
#	tests/baselines/reference/unionAndIntersectionInference1.types
#	tests/baselines/reference/unionOfClassCalls.types
#	tests/baselines/reference/usePromiseFinally.types

# Conflicts:
#	src/compiler/diagnosticMessages.json
#	src/compiler/utilities.ts