Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

This reverts commit d15a3fcc98.

extensions/merge-conflict/package.json

@@ -5,7 +5,6 @@
   "description": "%description%",
   "icon": "resources/icons/merge-conflict.png",
   "version": "1.0.0",
-  "license": "MIT",
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "engines": {
     "vscode": "^1.5.0"
@@ -115,21 +114,6 @@
           "type": "boolean",
           "description": "%config.autoNavigateNextConflictEnabled%",
           "default": false
-        },
-        "merge-conflict.diffViewPosition": {
-          "type": "string",
-          "enum": [
-            "Current",
-            "Beside",
-            "Below"
-          ],
-          "description": "%config.diffViewPosition%",
-          "enumDescriptions": [
-            "%config.diffViewPosition.current%",
-            "%config.diffViewPosition.beside%",
-            "%config.diffViewPosition.below%"
-          ],
-          "default": "Current"
         }
       }
     }
@@ -138,6 +122,6 @@
     "vscode-nls": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "^10.14.8"
+    "@types/node": "8.0.33"
   }
 }