diff --git a/src/views/conflicts-resolution/mobile-app.tsx b/src/views/conflicts-resolution/mobile-app.tsx
index d5e68b9..a613eb4 100644
--- a/src/views/conflicts-resolution/mobile-app.tsx
+++ b/src/views/conflicts-resolution/mobile-app.tsx
@@ -39,14 +39,26 @@ const MobileApp = ({
         key={file.filePath}
         style={{
           width: "100%",
+          paddingTop: "var(--size-4-4)",
+          paddingBottom: "var(--size-4-4)",
+          borderBottom: "1px solid var(--background-modifier-border)",
         }}
       >
+        <div
+          className="inline-title"
+          style={{
+            width: "100%",
+            paddingLeft: "var(--size-4-8)",
+            paddingRight: "var(--size-4-8)",
+          }}
+        >
+          {file.filePath}
+        </div>
         <UnifiedDiffView
           initialOldText={file.remoteContent || ""}
           initialNewText={file.localContent || ""}
           onConflictResolved={() => onConflictResolved(index)}
         />
-        <hr />
       </div>
     );
   };
diff --git a/src/views/conflicts-resolution/unified-diff-view.tsx b/src/views/conflicts-resolution/unified-diff-view.tsx
index 6af98d6..0104e31 100644
--- a/src/views/conflicts-resolution/unified-diff-view.tsx
+++ b/src/views/conflicts-resolution/unified-diff-view.tsx
@@ -240,16 +240,31 @@ const UnifiedDiffView: React.FC<UnifiedDiffViewProps> = ({
     diffChunks,
   );
 
+  const [hasConflicts, setHasConflicts] = React.useState(diffChunks.length > 0);
+
   const extensions = React.useMemo(() => {
     const conflictRangesField = createRangesStateField(lineRanges);
     return [
       conflictRangesField,
       createDecorationsExtension(conflictRangesField),
+      EditorView.updateListener.of((update) => {
+        if (update.docChanged) {
+          const conflictRanges = update.state.field(conflictRangesField);
+          const allConflictsSolved = conflictRanges.some(
+            (range) => range.source === "old" || range.source === "new",
+          );
+
+          if (!allConflictsSolved) {
+            setHasConflicts(allConflictsSolved);
+          }
+        }
+      }),
       EditorView.editable.of(true),
       EditorView.theme({
         "&": {
           backgroundColor: "var(--background-primary)",
           color: "var(--text-normal)",
+          border: "1px solid var(--background-modifier-border)",
         },
         ".cm-content": {
           padding: 0,
@@ -279,6 +294,26 @@ const UnifiedDiffView: React.FC<UnifiedDiffViewProps> = ({
         basicSetup={false}
         extensions={extensions}
       />
+      <div
+        style={{
+          display: "flex",
+          justifyContent: "center",
+          paddingTop: "var(--size-4-4)",
+        }}
+      >
+        <button
+          style={{
+            backgroundColor: "var(--interactive-accent)",
+            color: "var(--text-on-accent)",
+          }}
+          disabled={hasConflicts}
+          onClick={() => {
+            console.log("Conflict resolved");
+          }}
+        >
+          Resolve conflict
+        </button>
+      </div>
     </div>
   );
 };