diff --git a/src/views/conflicts-resolution/component.tsx b/src/views/conflicts-resolution/split-diff-view.tsx
similarity index 98%
rename from src/views/conflicts-resolution/component.tsx
rename to src/views/conflicts-resolution/split-diff-view.tsx
index c65a980..bbf9716 100644
--- a/src/views/conflicts-resolution/component.tsx
+++ b/src/views/conflicts-resolution/split-diff-view.tsx
@@ -31,7 +31,7 @@ interface DiffViewProps {
   onConflictResolved: () => void;
 }
 
-const DiffView: React.FC<DiffViewProps> = ({
+const SplitDiffView: React.FC<DiffViewProps> = ({
   oldText,
   newText,
   onOldTextChange,
@@ -176,4 +176,4 @@ const DiffView: React.FC<DiffViewProps> = ({
   );
 };
 
-export default DiffView;
+export default SplitDiffView;
diff --git a/src/views/conflicts-resolution/view.tsx b/src/views/conflicts-resolution/view.tsx
index 3e3f0b9..70aff71 100644
--- a/src/views/conflicts-resolution/view.tsx
+++ b/src/views/conflicts-resolution/view.tsx
@@ -1,6 +1,6 @@
 import { IconName, ItemView, Menu, WorkspaceLeaf } from "obsidian";
 import { Root, createRoot } from "react-dom/client";
-import DiffView from "./component";
+import SplitDiffView from "./split-diff-view";
 import GitHubSyncPlugin from "src/main";
 import * as React from "react";
 import FilesTabBar from "./files-tab-bar";
@@ -133,7 +133,7 @@ export class ConflictsResolutionView extends ItemView {
                   currentFile={currentFile?.filePath || ""}
                   setCurrentFileIndex={setCurrentFileIndex}
                 />
-                <DiffView
+                <SplitDiffView
                   oldText={currentFile?.remoteContent || ""}
                   newText={currentFile?.localContent || ""}
                   onOldTextChange={(content: string) => {