Name, description, icon for merge-conflict extension (#43978)

extensions/merge-conflict/README.md

+# Merge Conflict
+
+**Notice** This is a an extension that is bundled with Visual Studio Code.

extensions/merge-conflict/package.json

 {
   "name": "merge-conflict",
   "publisher": "vscode",
-  "displayName": "merge-conflict",
-  "description": "Merge Conflict",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "icon": "resources/icons/merge-conflict.png",
   "version": "0.7.0",
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "engines": {

extensions/merge-conflict/package.nls.json

 {
+	"displayName": "Merge Conflict",
+	"description": "Coloring and commands for inline merge conflicts.",
 	"command.category": "Merge Conflict",
 	"command.accept.all-current": "Accept All Current",
 	"command.accept.all-incoming": "Accept All Incoming",