diff --git a/lib/vscode/build/npm/preinstall.js b/lib/vscode/build/npm/preinstall.js
index 251d52008..94dbb3b9e 100644
--- a/lib/vscode/build/npm/preinstall.js
+++ b/lib/vscode/build/npm/preinstall.js
@@ -7,16 +7,9 @@ let err = false;
 
 const majorNodeVersion = parseInt(/^(\d+)\./.exec(process.versions.node)[1]);
 
-<<<<<<< HEAD
-if (majorNodeVersion < 10 || majorNodeVersion >= 13) {
-	// We are ok building above Node 12.
-	// console.error('\033[1;31m*** Please use node >=10 and <=12.\033[0;0m');
-	// err = true;
-=======
 if (majorNodeVersion < 10 || majorNodeVersion >= 16) {
 	console.error('\033[1;31m*** Please use node >=10 and <=16.\033[0;0m');
 	err = true;
->>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775
 }
 
 const cp = require('child_process');