Apply suggestions from code review

Adds suggestions from PR.

Author: hediet

extensions/merge-conflict/src/documentMergeConflict.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as interfaces from './interfaces';
 import * as vscode from 'vscode';
-import TelemetryReporter from '@vscode/extension-telemetry';
+import type TelemetryReporter from '@vscode/extension-telemetry';
 
 export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict {
 

extensions/merge-conflict/src/services.ts

@@ -19,7 +19,7 @@ export default class ServiceWrapper implements vscode.Disposable {
 	private telemetryReporter: TelemetryReporter;
 
 	constructor(private context: vscode.ExtensionContext) {
-		const { aiKey } = require('../package.json') as { aiKey: string };
+		const { aiKey } = context.extension.packageJSON as { aiKey: string };
 		this.telemetryReporter = new TelemetryReporter(aiKey);
 		context.subscriptions.push(this.telemetryReporter);
 	}