diff --git a/lib/vscode/src/vs/base/node/languagePacks.js b/lib/vscode/src/vs/base/node/languagePacks.js
index 9f21be50..2cc50d96 100644
--- a/lib/vscode/src/vs/base/node/languagePacks.js
+++ b/lib/vscode/src/vs/base/node/languagePacks.js
@@ -78,12 +78,6 @@
 				// Do nothing. If we can't read the file we have no
 				// language pack config.
 			}
-		}, err => {
-			if (err.code === 'ENOENT') {
-				return undefined;
-			}
-			throw err;
-		});
 	}
 
 	function readFile(file) {
@@ -121,15 +115,17 @@
 	 * @returns {object}
 	 */
 	function getLanguagePackConfigurations(userDataPath) {
-		const configFile = path.join(userDataPath, 'languagepacks.json');
-		try {
-			// NOTE@coder: Swapped require with readFile since require is cached and
-			// we don't restart the server-side portion of code-server when the
-			// language changes.
-			return JSON.parse(fs.readFileSync(configFile, 'utf8'));
-		} catch (err) {
-			// Do nothing. If we can't read the file we have no
-			// language pack config.
+			const configFile = path.join(userDataPath, 'languagepacks.json');
+			try {
+				// NOTE@coder: Swapped require with readFile since require is cached and
+				// we don't restart the server-side portion of code-server when the
+				// language changes.
+				return JSON.parse(fs.readFileSync(configFile, 'utf8'));
+			} catch (err) {
+				// Do nothing. If we can't read the file we have no
+				// language pack config.
+			}
+			return undefined;
 		}
 
 		/**
diff --git a/lib/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/lib/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index de6ebabd..da98f38f 100644
--- a/lib/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/lib/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -24,12 +24,9 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
 import { canceled } from 'vs/base/common/errors';
 import { IUserDataAutoSyncEnablementService, IUserDataSyncResourceEnablementService, SyncResource } from 'vs/platform/userDataSync/common/userDataSync';
-<<<<<<< HEAD
 import { isWeb } from 'vs/base/common/platform';
-=======
 import { Promises } from 'vs/base/common/async';
 import { IWorkspaceTrustService, WorkspaceTrustState } from 'vs/platform/workspace/common/workspaceTrust';
->>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384
 
 export class ExtensionManagementService extends Disposable implements IWorkbenchExtensioManagementService {
 
@@ -263,13 +260,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 
 		// Install Language pack on local and remote servers
 		if (isLanguagePackExtension(manifest)) {
-<<<<<<< HEAD
-			// NOTE@coder: It does not appear language packs can be installed on the web
-			// extension management server at this time. Filter out the web to fix this.
-			servers.push(...this.servers.filter(s => s !== this.extensionManagementServerService.webExtensionManagementServer));
-=======
 			servers.push(...this.servers.filter(server => server !== this.extensionManagementServerService.webExtensionManagementServer));
->>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384
 		} else {
 			const server = this.getExtensionManagementServerToInstall(manifest);
 			if (server) {