Fix typo in MergeDecorator class name

extensions/merge-conflict/src/mergeDecorator.ts

@@ -7,7 +7,7 @@ import * as interfaces from './interfaces';
 import { loadMessageBundle } from 'vscode-nls';
 const localize = loadMessageBundle();
 
-export default class MergeDectorator implements vscode.Disposable {
+export default class MergeDecorator implements vscode.Disposable {
 
 	private decorations: { [key: string]: vscode.TextEditorDecorationType } = {};
 
@@ -249,4 +249,4 @@ export default class MergeDectorator implements vscode.Disposable {
 			}
 		});
 	}
-}
\ No newline at end of file
+}