diff --git a/lib/vscode/src/vs/workbench/services/extensions/browser/extensionService.ts b/lib/vscode/src/vs/workbench/services/extensions/browser/extensionService.ts
index 80106c5c..03c8b4b2 100644
--- a/lib/vscode/src/vs/workbench/services/extensions/browser/extensionService.ts
+++ b/lib/vscode/src/vs/workbench/services/extensions/browser/extensionService.ts
@@ -87,11 +87,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 			if (code === ExtensionHostExitCode.StartTimeout60s) {
 				this._notificationService.prompt(
 					Severity.Error,
-<<<<<<< HEAD
-					nls.localize('extensionService.startTimeout', 'The Web Worker Extension Host did not start in 10s.'),
-=======
 					nls.localize('extensionService.startTimeout', "The Web Worker Extension Host did not start in 60s."),
->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
 					[]
 				);
 				return;