diff --git a/src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs b/src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs
index c0887e9..976ee2f 100644
--- a/src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs
+++ b/src/ClaudeDo.Ui/ViewModels/IslandsShellViewModel.cs
@@ -227,6 +227,7 @@ public sealed partial class IslandsShellViewModel : ViewModelBase
             _ = Lists.RefreshCountsAsync();
             return System.Threading.Tasks.Task.CompletedTask;
         };
+        Details.RequestConflictResolution = RequestConflictResolutionAsync;
         Worker.PropertyChanged += (_, e) =>
         {
             if (e.PropertyName is nameof(WorkerClient.IsConnected) or nameof(WorkerClient.IsReconnecting))
diff --git a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
index 4dcfcc7..2e68184 100644
--- a/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
@@ -81,6 +81,10 @@ public partial class MainWindow : Window
                     var mergeDlg = new MergeModalView { DataContext = mergeVm };
                     await mergeDlg.ShowDialog(this);
                 };
+                modal.RequestConflictResolution = (taskId, target) =>
+                    DataContext is IslandsShellViewModel s
+                        ? s.RequestConflictResolutionAsync(taskId, target)
+                        : System.Threading.Tasks.Task.CompletedTask;
                 await dlg.ShowDialog(this);
             };
             vm.ShowRepoImportModal = async (modal) =>