diff --git a/src/views/conflicts-resolution/editor-pane.tsx b/src/views/conflicts-resolution/editor-pane.tsx
index 4464d31..86c3de0 100644
--- a/src/views/conflicts-resolution/editor-pane.tsx
+++ b/src/views/conflicts-resolution/editor-pane.tsx
@@ -51,8 +51,12 @@ const EditorPane: React.FC<EditorPaneProps> = (props) => {
   return (
     <CodeMirror
       value={content}
+      style={{
+        height: "100%",
+      }}
       theme={"none"}
       width={"100%"}
+      height={"100%"}
       basicSetup={false}
       extensions={extensions}
       onChange={(value: string) => {