diff --git a/extensions/merge-conflict/src/codelensProvider.ts b/extensions/merge-conflict/src/codelensProvider.ts
index ca54a189a7a9825ea87e2bdc51680fb43de51f11..32b1cb9e3816e90f030e048822e71bda31195706 100644
--- a/extensions/merge-conflict/src/codelensProvider.ts
+++ b/extensions/merge-conflict/src/codelensProvider.ts
@@ -13,7 +13,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
 	private config: interfaces.IExtensionConfiguration;
 	private tracker: interfaces.IDocumentMergeConflictTracker;
 
-	constructor(private context: vscode.ExtensionContext, trackerService: interfaces.IDocumentMergeConflictTrackerService) {
+	constructor(trackerService: interfaces.IDocumentMergeConflictTrackerService) {
 		this.tracker = trackerService.createTracker('codelens');
 	}
 
@@ -46,7 +46,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
 		}
 	}
 
-	async provideCodeLenses(document: vscode.TextDocument, token: vscode.CancellationToken): Promise<vscode.CodeLens[] | null> {
+	async provideCodeLenses(document: vscode.TextDocument, _token: vscode.CancellationToken): Promise<vscode.CodeLens[] | null> {
 
 		if (!this.config || !this.config.enableCodeLens) {
 			return null;
diff --git a/extensions/merge-conflict/src/commandHandler.ts b/extensions/merge-conflict/src/commandHandler.ts
index 50ce36885b9771817b9cc9e37a1dca473aa798a9..1a737cfaf3fa0bce25dc49c9a2859c5c04b02d5b 100644
--- a/extensions/merge-conflict/src/commandHandler.ts
+++ b/extensions/merge-conflict/src/commandHandler.ts
@@ -24,7 +24,7 @@ export default class CommandHandler implements vscode.Disposable {
 	private disposables: vscode.Disposable[] = [];
 	private tracker: interfaces.IDocumentMergeConflictTracker;
 
-	constructor(private context: vscode.ExtensionContext, trackerService: interfaces.IDocumentMergeConflictTrackerService) {
+	constructor(trackerService: interfaces.IDocumentMergeConflictTrackerService) {
 		this.tracker = trackerService.createTracker('commands');
 	}
 
@@ -62,19 +62,19 @@ export default class CommandHandler implements vscode.Disposable {
 		return this.accept(interfaces.CommitType.Both, editor, ...args);
 	}
 
-	acceptAllCurrent(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
+	acceptAllCurrent(editor: vscode.TextEditor): Promise<void> {
 		return this.acceptAll(interfaces.CommitType.Current, editor);
 	}
 
-	acceptAllIncoming(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
+	acceptAllIncoming(editor: vscode.TextEditor): Promise<void> {
 		return this.acceptAll(interfaces.CommitType.Incoming, editor);
 	}
 
-	acceptAllBoth(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
+	acceptAllBoth(editor: vscode.TextEditor): Promise<void> {
 		return this.acceptAll(interfaces.CommitType.Both, editor);
 	}
 
-	async compare(editor: vscode.TextEditor, conflict: interfaces.IDocumentMergeConflict | null, ...args: any[]) {
+	async compare(editor: vscode.TextEditor, conflict: interfaces.IDocumentMergeConflict | null) {
 		const fileName = path.basename(editor.document.uri.fsPath);
 
 		// No conflict, command executed from command palette
@@ -102,15 +102,15 @@ export default class CommandHandler implements vscode.Disposable {
 		vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title);
 	}
 
-	navigateNext(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
+	navigateNext(editor: vscode.TextEditor): Promise<void> {
 		return this.navigate(editor, NavigationDirection.Forwards);
 	}
 
-	navigatePrevious(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
+	navigatePrevious(editor: vscode.TextEditor): Promise<void> {
 		return this.navigate(editor, NavigationDirection.Backwards);
 	}
 
-	async acceptSelection(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
+	async acceptSelection(editor: vscode.TextEditor): Promise<void> {
 		let conflict = await this.findConflictContainingSelection(editor);
 
 		if (!conflict) {
diff --git a/extensions/merge-conflict/src/contentProvider.ts b/extensions/merge-conflict/src/contentProvider.ts
index 446ab052f22979231d210d631cc26ad58b3c66d3..37e5923e135f0008476eb24a5cac00a80bc11348 100644
--- a/extensions/merge-conflict/src/contentProvider.ts
+++ b/extensions/merge-conflict/src/contentProvider.ts
@@ -4,21 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 import * as vscode from 'vscode';
-import * as interfaces from './interfaces';
 
 export default class MergeConflictContentProvider implements vscode.TextDocumentContentProvider, vscode.Disposable {
 
 	static scheme = 'merge-conflict.conflict-diff';
 
-	constructor(private context: vscode.ExtensionContext) {
-	}
-
-	begin(config: interfaces.IExtensionConfiguration) {
-		this.context.subscriptions.push(
-			vscode.workspace.registerTextDocumentContentProvider(MergeConflictContentProvider.scheme, this)
-		);
-	}
-
 	dispose() {
 	}
 
diff --git a/extensions/merge-conflict/src/documentMergeConflict.ts b/extensions/merge-conflict/src/documentMergeConflict.ts
index d8541e0e20a164519e9b9092f0596cee94705812..3bf94a16ea772d94fbaee8f3f4d126e144bf2a5c 100644
--- a/extensions/merge-conflict/src/documentMergeConflict.ts
+++ b/extensions/merge-conflict/src/documentMergeConflict.ts
@@ -13,7 +13,7 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
 	public commonAncestors: interfaces.IMergeRegion[];
 	public splitter: vscode.Range;
 
-	constructor(document: vscode.TextDocument, descriptor: interfaces.IDocumentMergeConflictDescriptor) {
+	constructor(descriptor: interfaces.IDocumentMergeConflictDescriptor) {
 		this.range = descriptor.range;
 		this.current = descriptor.current;
 		this.incoming = descriptor.incoming;
diff --git a/extensions/merge-conflict/src/documentTracker.ts b/extensions/merge-conflict/src/documentTracker.ts
index 83c578122fc7eb8d6ec0e2f2c060abfd1623afe6..f70cd91f1850dc724c4c55ad6594b8e30d4a4005 100644
--- a/extensions/merge-conflict/src/documentTracker.ts
+++ b/extensions/merge-conflict/src/documentTracker.ts
@@ -116,7 +116,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
 		this.cache.clear();
 	}
 
-	private getConflictsOrEmpty(document: vscode.TextDocument, origins: string[]): interfaces.IDocumentMergeConflict[] {
+	private getConflictsOrEmpty(document: vscode.TextDocument, _origins: string[]): interfaces.IDocumentMergeConflict[] {
 		const containsConflict = MergeConflictParser.containsConflict(document);
 
 		if (!containsConflict) {
diff --git a/extensions/merge-conflict/src/mergeConflictParser.ts b/extensions/merge-conflict/src/mergeConflictParser.ts
index 4ff9a58e07ce9c066b5f7e2a21c04f4607921c9d..84a4607ac146679a4a614d09765ecfb888a1d50e 100644
--- a/extensions/merge-conflict/src/mergeConflictParser.ts
+++ b/extensions/merge-conflict/src/mergeConflictParser.ts
@@ -81,7 +81,7 @@ export class MergeConflictParser {
 
 		return conflictDescriptors
 			.filter(Boolean)
-			.map(descriptor => new DocumentMergeConflict(document, descriptor));
+			.map(descriptor => new DocumentMergeConflict(descriptor));
 	}
 
 	private static scanItemTolMergeConflictDescriptor(document: vscode.TextDocument, scanned: IScanMergedConflict): interfaces.IDocumentMergeConflictDescriptor | null {
diff --git a/extensions/merge-conflict/src/services.ts b/extensions/merge-conflict/src/services.ts
index 320adb3e53e59bee0a6fd63eac32ea38c77b4883..f3eb0e0630e9f83738370dec7f11cea6daf0948b 100644
--- a/extensions/merge-conflict/src/services.ts
+++ b/extensions/merge-conflict/src/services.ts
@@ -26,9 +26,9 @@ export default class ServiceWrapper implements vscode.Disposable {
 
 		this.services.push(
 			documentTracker,
-			new CommandHandler(this.context, documentTracker),
-			new CodeLensProvider(this.context, documentTracker),
-			new ContentProvider(this.context),
+			new CommandHandler(documentTracker),
+			new CodeLensProvider(documentTracker),
+			new ContentProvider(),
 			new Decorator(this.context, documentTracker),
 		);
 
diff --git a/extensions/merge-conflict/tsconfig.json b/extensions/merge-conflict/tsconfig.json
index b67b8ea9a1d5b05215dfff6fcf19af47d86a130b..545f2260b61e4e59da9e8c5c188863e379e44b6d 100644
--- a/extensions/merge-conflict/tsconfig.json
+++ b/extensions/merge-conflict/tsconfig.json
@@ -6,6 +6,10 @@
 		],
 		"module": "commonjs",
 		"outDir": "./out",
+		"noImplicitAny": true,
+		"noImplicitReturns": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
 		"strict": true,
 		"experimentalDecorators": true
 	},