diff --git a/src/views/conflicts-resolution/unified-diff-view.tsx b/src/views/conflicts-resolution/unified-diff-view.tsx
index 4afb5a4..639f8ff 100644
--- a/src/views/conflicts-resolution/unified-diff-view.tsx
+++ b/src/views/conflicts-resolution/unified-diff-view.tsx
@@ -1,6 +1,7 @@
 import * as React from "react";
 import CodeMirror, {
   EditorState,
+  Range,
   RangeSetBuilder,
   StateEffect,
   StateField,
@@ -306,7 +307,7 @@ const createBlockDecorations = (
     [rangesStateField],
     (state: EditorState) => {
       const ranges = state.field(rangesStateField);
-      let widgets = [];
+      let widgets: Range<Decoration>[] = [];
 
       ranges.forEach((range: ConflictRange, index: number) => {
         if (range.source === "both") {