diff --git a/src/views/conflicts-resolution/editor-pane.tsx b/src/views/conflicts-resolution/editor-pane.tsx
index 4367466..a6556d2 100644
--- a/src/views/conflicts-resolution/editor-pane.tsx
+++ b/src/views/conflicts-resolution/editor-pane.tsx
@@ -54,7 +54,8 @@ const EditorPane: React.FC<EditorPaneProps> = (props) => {
       markdown(),
       EditorView.domEventObservers({
         scroll(event) {
-          onScrollTopUpdate?.(event.target.scrollTop);
+          const target = event.target as HTMLElement;
+          onScrollTopUpdate?.(target.scrollTop);
         },
       }),
     ];