diff --git a/lib/vscode/src/vs/base/node/languagePacks.js b/lib/vscode/src/vs/base/node/languagePacks.js
index d872d93e..9f21be50 100644
--- a/lib/vscode/src/vs/base/node/languagePacks.js
+++ b/lib/vscode/src/vs/base/node/languagePacks.js
@@ -78,7 +78,6 @@
 				// Do nothing. If we can't read the file we have no
 				// language pack config.
 			}
-<<<<<<< HEAD
 		}, err => {
 			if (err.code === 'ENOENT') {
 				return undefined;
@@ -131,9 +130,6 @@
 		} catch (err) {
 			// Do nothing. If we can't read the file we have no
 			// language pack config.
-=======
-			return undefined;
->>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384
 		}
 
 		/**