1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/merge-conflict/src/delayer.ts b/extensions/merge-conflict/src/delayer.ts
index e4ef18e09c9..8609ff6abe4 100644
--- a/extensions/merge-conflict/src/delayer.ts
+++ b/extensions/merge-conflict/src/delayer.ts
@@ -35,7 +35,7 @@ export class Delayer<T> {
 			}).then(() => {
 				this.completionPromise = null;
 				this.onSuccess = null;
-				let result = this.task!();
+				const result = this.task!();
 				this.task = null;
 				return result;
 			});
@@ -56,7 +56,7 @@ export class Delayer<T> {
 			return null;
 		}
 		this.cancelTimeout();
-		let result = this.completionPromise;
+		const result = this.completionPromise;
 		this.onSuccess!(undefined);
 		return result;
 	}