Rename content provider to match extension name

extensions/merge-conflict/src/contentProvider.ts

@@ -8,7 +8,7 @@ import * as interfaces from './interfaces';
 
 export default class MergeConflictContentProvider implements vscode.TextDocumentContentProvider, vscode.Disposable {
 
-	static scheme = 'git.merge.conflict-diff';
+	static scheme = 'merge-conflict.conflict-diff';
 
 	constructor(private context: vscode.ExtensionContext) {
 	}