diff --git a/Files/DataModels/FilesystemItemsOperationDataModel.cs b/Files/DataModels/FilesystemItemsOperationDataModel.cs
index 429db5456dc4..57eebb3a00aa 100644
--- a/Files/DataModels/FilesystemItemsOperationDataModel.cs
+++ b/Files/DataModels/FilesystemItemsOperationDataModel.cs
@@ -1,5 +1,6 @@
 using Files.Enums;
 using Files.ViewModels.Dialogs;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Windows.UI.Xaml;
@@ -52,7 +53,7 @@ public FilesystemItemsOperationDataModel(FilesystemOperationType operationType,
             this.ConflictingItems = conflictingItems;
         }
 
-        public List<FilesystemOperationItemViewModel> ToItems()
+        public List<FilesystemOperationItemViewModel> ToItems(Action updatePrimaryButtonEnabled, Action optionGenerateNewName, Action optionReplaceExisting, Action optionSkip)
         {
             List<FilesystemOperationItemViewModel> items = new List<FilesystemOperationItemViewModel>();
 
@@ -61,31 +62,32 @@ public List<FilesystemOperationItemViewModel> ToItems()
             // Add conflicting items first
             foreach (var item in ConflictingItems)
             {
-                items.Add(new FilesystemOperationItemViewModel()
+                items.Add(new FilesystemOperationItemViewModel(updatePrimaryButtonEnabled, optionGenerateNewName, optionReplaceExisting, optionSkip)
                 {
+                    IsConflict = true,
                     OperationIconGlyph = GetOperationIconGlyph(item.OperationType),
                     SourcePath = item.SourcePath,
-                    PlusIconVisibility = Visibility.Collapsed,
                     DestinationPath = item.DestinationPath,
-                    IsConflicting = true,
+                    ConflictResolveOption = FileNameConflictResolveOptionType.GenerateNewName,
                     ExclamationMarkVisibility = Visibility.Visible,
-                    ItemOperation = item.OperationType
+                    ItemOperation = item.OperationType,
+                    ActionTaken = false
                 });
             }
 
             // Then add non-conflicting items
             foreach (var item in nonConflictingItems)
             {
-                items.Add(new FilesystemOperationItemViewModel()
+                items.Add(new FilesystemOperationItemViewModel(updatePrimaryButtonEnabled, optionGenerateNewName, optionReplaceExisting, optionSkip)
                 {
+                    IsConflict = false,
                     OperationIconGlyph = GetOperationIconGlyph(item.OperationType),
                     SourcePath = item.SourcePath,
-                    ArrowIconVisibility = item.OperationType == FilesystemOperationType.Delete ? Visibility.Collapsed : Visibility.Visible,
-                    PlusIconVisibility = item.OperationType == FilesystemOperationType.Delete ? Visibility.Collapsed : Visibility.Visible,
                     DestinationPath = item.DestinationPath,
-                    IsConflicting = false,
+                    ConflictResolveOption = FileNameConflictResolveOptionType.NotAConflict,
                     ExclamationMarkVisibility = Visibility.Collapsed,
-                    ItemOperation = item.OperationType
+                    ItemOperation = item.OperationType,
+                    ActionTaken = true
                 });
             }
 
diff --git a/Files/Dialogs/FilesystemOperationDialog.xaml b/Files/Dialogs/FilesystemOperationDialog.xaml
index 6d6343c0af2d..c85c3366e504 100644
--- a/Files/Dialogs/FilesystemOperationDialog.xaml
+++ b/Files/Dialogs/FilesystemOperationDialog.xaml
@@ -4,14 +4,15 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:helpers="using:Files.Helpers"
+    xmlns:i="using:Microsoft.Xaml.Interactivity"
+    xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:vc="using:Files.Converters"
     Title="{x:Bind ViewModel.Title, Mode=OneWay}"
-    CloseButtonCommand="{x:Bind ViewModel.CloseButtonCommand, Mode=OneWay}"
-    CloseButtonStyle="{StaticResource DefaultButtonStyle}"
-    CloseButtonText="{x:Bind ViewModel.CloseButtonText, Mode=OneWay}"
     CornerRadius="4"
     DefaultButton="Primary"
+    IsPrimaryButtonEnabled="{x:Bind ViewModel.PrimaryButtonEnabled, Mode=OneWay}"
     PrimaryButtonCommand="{x:Bind ViewModel.PrimaryButtonCommand, Mode=OneWay}"
     PrimaryButtonStyle="{StaticResource DefaultButtonStyle}"
     PrimaryButtonText="{x:Bind ViewModel.PrimaryButtonText, Mode=OneWay}"
@@ -20,6 +21,12 @@
     SecondaryButtonStyle="{StaticResource DefaultButtonStyle}"
     SecondaryButtonText="{x:Bind ViewModel.SecondaryButtonText, Mode=OneWay}"
     mc:Ignorable="d">
+    <i:Interaction.Behaviors>
+        <!--  No need to specify CommandParameter - `e` is passed by default  -->
+        <icore:EventTriggerBehavior EventName="Loaded">
+            <icore:InvokeCommandAction Command="{x:Bind ViewModel.LoadedCommand, Mode=OneWay}" />
+        </icore:EventTriggerBehavior>
+    </i:Interaction.Behaviors>
 
     <ContentDialog.Resources>
         <ResourceDictionary>
@@ -38,174 +45,263 @@
                     </ResourceDictionary.ThemeDictionaries>
                 </ResourceDictionary>
                 <ResourceDictionary>
-                    <vc:MiddleTextEllipsisConverter x:Key="MiddleTextEllipsisConverter" />
                     <vc:VisiblityInvertConverter x:Key="VisiblityInvertConverter" />
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </ContentDialog.Resources>
 
-    <Border MaxWidth="500">
-        <Grid>
-            <StackPanel Spacing="12">
-                <TextBlock Text="{x:Bind ViewModel.Subtitle, Mode=OneWay}" />
-
-                <CheckBox
-                    x:Name="chkPermanentlyDelete"
-                    x:Uid="DeleteItemsDialogPermanentlyDeleteCheckBox"
-                    x:Load="{x:Bind ViewModel.PermanentlyDeleteLoad, Mode=OneWay}"
-                    Content="Permanently delete"
-                    IsChecked="{x:Bind ViewModel.PermanentlyDelete, Mode=TwoWay}"
-                    IsEnabled="{x:Bind ViewModel.PermanentlyDeleteEnabled, Mode=OneWay}" />
-
-                <Button
-                    x:Name="ExpandButton"
-                    Padding="0,4,0,0"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    BorderThickness="0"
-                    Command="{x:Bind ViewModel.ExpandDetailsCommand, Mode=OneWay}"
-                    CommandParameter="{x:Bind ViewModel}">
-                    <Button.Content>
-                        <StackPanel Orientation="Horizontal" Spacing="4">
-                            <FontIcon
-                                x:Name="Expand"
-                                x:Load="{x:Bind ViewModel.ChevronDownLoad, Mode=OneWay}"
-                                FontSize="14"
-                                Glyph="&#xE70D;" />
-                            <FontIcon
-                                x:Name="Collapse"
-                                x:Load="{x:Bind ViewModel.ChevronUpLoad, Mode=OneWay}"
-                                FontSize="14"
-                                Glyph="&#xE70E;" />
-                            <TextBlock FontWeight="Bold" Text="Details" />
-                        </StackPanel>
-                    </Button.Content>
-                </Button>
-
-                <ScrollViewer
-                    x:Name="ExpandableDetails"
-                    MaxHeight="300"
-                    HorizontalAlignment="Stretch"
-                    x:Load="{x:Bind ViewModel.ExpandableDetailsLoad, Mode=OneWay}"
-                    HorizontalScrollBarVisibility="Auto"
-                    VerticalScrollBarVisibility="Auto">
-                    <Grid>
-                        <GridView
-                            IsItemClickEnabled="False"
-                            ItemsSource="{x:Bind ViewModel.Items}"
-                            SelectionMode="None">
-                            <GridView.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <ItemsStackPanel Orientation="Vertical" />
-                                </ItemsPanelTemplate>
-                            </GridView.ItemsPanel>
-
-                            <!--  Remove Reveal Highlight Effect  -->
-                            <GridView.ItemContainerStyle>
-                                <Style TargetType="GridViewItem">
-                                    <!--  Spacing  -->
-                                    <Setter Property="Margin" Value="0" />
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="GridViewItem">
-                                                <ListViewItemPresenter
-                                                    x:Name="Root"
-                                                    RevealBackground="{ThemeResource GridViewItemRevealBackground}"
-                                                    RevealBorderBrush="{ThemeResource GridViewItemRevealBorderBrush}"
-                                                    RevealBorderThickness="0" />
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                            </GridView.ItemContainerStyle>
-                            <GridView.ItemTemplate>
-                                <DataTemplate>
-                                    <Border>
-                                        <Grid ColumnSpacing="12">
-                                            <Grid.ColumnDefinitions>
-                                                <!--  Status Icon  -->
-                                                <ColumnDefinition Width="Auto" />
-                                                <!--  Source item name  -->
-                                                <ColumnDefinition Width="Auto" />
-                                                <!--  Arrow icon  -->
-                                                <ColumnDefinition Width="Auto" />
-                                                <!--  Destination item name  -->
-                                                <ColumnDefinition Width="Auto" />
-                                                <!--  File added (+) icon  -->
-                                                <ColumnDefinition Width="Auto" />
-                                            </Grid.ColumnDefinitions>
-
-                                            <!--  Operation type icon  -->
+    <Grid Width="500">
+        <StackPanel Spacing="12">
+            <TextBlock Text="{x:Bind ViewModel.Subtitle, Mode=OneWay}" />
+
+            <CheckBox
+                x:Name="chkPermanentlyDelete"
+                x:Uid="DeleteItemsDialogPermanentlyDeleteCheckBox"
+                x:Load="{x:Bind ViewModel.PermanentlyDeleteLoad, Mode=OneWay}"
+                Content="Permanently delete"
+                IsChecked="{x:Bind ViewModel.PermanentlyDelete, Mode=TwoWay}"
+                IsEnabled="{x:Bind ViewModel.PermanentlyDeleteEnabled, Mode=OneWay}" />
+
+            <muxc:Expander
+                x:Name="DetailsExpander"
+                x:Uid="FileOperationsDialogDetailsExpander"
+                Padding="0"
+                HorizontalAlignment="Stretch"
+                Background="Transparent"
+                BorderBrush="Transparent"
+                Header="Details">
+                <Grid>
+                    <ListView
+                        x:Name="DetailsGrid"
+                        Grid.Row="1"
+                        MaxHeight="200"
+                        IsItemClickEnabled="False"
+                        ItemsSource="{x:Bind ViewModel.Items}"
+                        SelectionMode="{x:Bind ViewModel.ItemsSelectionMode, Mode=OneWay}">
+
+                        <ListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <ItemsStackPanel Orientation="Vertical" />
+                            </ItemsPanelTemplate>
+                        </ListView.ItemsPanel>
+
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Border>
+                                    <Grid
+                                        Width="472"
+                                        Padding="8"
+                                        ColumnSpacing="12"
+                                        RowSpacing="4">
+                                        <Grid.ColumnDefinitions>
+                                            <!--  Operation type  -->
+                                            <ColumnDefinition Width="Auto" />
+                                            <!--  Item names  -->
+                                            <ColumnDefinition Width="Auto" />
+                                            <!--  ComboBox with options  -->
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <Grid.RowDefinitions>
+                                            <!--  File name  -->
+                                            <RowDefinition Height="16" />
+                                            <!--  Source folder and destination folder  -->
+                                            <RowDefinition Height="20" />
+                                        </Grid.RowDefinitions>
+
+                                        <!--  Operation type icon  -->
+                                        <FontIcon
+                                            Grid.RowSpan="2"
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="24"
+                                            Glyph="{Binding OperationIconGlyph, Mode=OneWay}" />
+
+                                        <!--  Exclamation mark icon for conflicts  -->
+                                        <Grid
+                                            Grid.RowSpan="2"
+                                            Grid.Column="0"
+                                            Margin="0,0,-2,8"
+                                            HorizontalAlignment="Right"
+                                            VerticalAlignment="Bottom"
+                                            Visibility="{Binding ExclamationMarkVisibility}">
+                                            <!--  Background  -->
+                                            <Polygon Fill="{ThemeResource SolidBackgroundFillColorBaseBrush}" Points="6,0 0,10, 12,10" />
+                                            <!--  Exclamation mark  -->
                                             <FontIcon
-                                                Grid.Column="0"
-                                                HorizontalAlignment="Center"
+                                                FontSize="12"
+                                                Foreground="{ThemeResource FilesystemOperationDialogExclamationMarkIconColor}"
+                                                Glyph="&#xE7BA;" />
+                                        </Grid>
+
+                                        <!--  Destination Filename  -->
+                                        <TextBlock
+                                            Grid.Row="0"
+                                            Grid.Column="1"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center"
+                                            FontSize="12"
+                                            FontWeight="Bold"
+                                            Text="{Binding DisplayFileName}" />
+
+                                        <Grid Grid.Row="1" Grid.Column="1">
+
+                                            <!--  Taken action text  -->
+                                            <TextBlock
+                                                HorizontalAlignment="Left"
                                                 VerticalAlignment="Center"
-                                                Glyph="{Binding OperationIconGlyph, Mode=OneWay}" />
-
-                                            <!--  Exclamation mark icon for conflicts  -->
-                                            <Grid
-                                                Grid.Column="0"
-                                                Margin="0,0,-2,8"
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Bottom"
-                                                Visibility="{Binding ExclamationMarkVisibility}">
-                                                <!--  Background  -->
-                                                <Polygon Fill="{ThemeResource SolidBackgroundFillColorBaseBrush}" Points="6,0 0,10, 12,10" />
-                                                <!--  Exclamation mark  -->
+                                                FontSize="12"
+                                                Foreground="Gray"
+                                                Text="{Binding TakenActionText}"
+                                                Visibility="{Binding ShowResolveOption}" />
+
+                                            <!--  Source folder and destination folder  -->
+                                            <StackPanel
+                                                HorizontalAlignment="Left"
+                                                Orientation="Horizontal"
+                                                Spacing="8"
+                                                Visibility="{Binding ShowSubFolders}">
+                                                <!--  Source folder name  -->
+                                                <TextBlock
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Foreground="Gray"
+                                                    Text="{Binding SourceDirectoryDisplayName}" />
+
+                                                <!--  Arrow icon  -->
                                                 <FontIcon
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
                                                     FontSize="12"
-                                                    Foreground="{ThemeResource FilesystemOperationDialogExclamationMarkIconColor}"
-                                                    Glyph="&#xE7BA;" />
-                                            </Grid>
+                                                    Foreground="Gray"
+                                                    Glyph="&#xEA62;"
+                                                    Visibility="{Binding DestinationLocationVisibility}" />
 
-                                            <!--  Source file path  -->
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Text="{Binding SourcePath}" />
+                                                <!--  Destination folder name  -->
+                                                <TextBlock
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Foreground="Gray"
+                                                    Text="{Binding DestinationDirectoryDisplayName}"
+                                                    Visibility="{Binding DestinationLocationVisibility}" />
+                                            </StackPanel>
 
-                                            <!--  Arrow Icon  -->
-                                            <FontIcon
-                                                Grid.Column="2"
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Glyph="&#xEA62;"
-                                                Visibility="{Binding ArrowIconVisibility}" />
-                                            <!--  'x' icon  -->
-                                            <FontIcon
-                                                Grid.Column="2"
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Foreground="Red"
-                                                Glyph="&#xE894;"
-                                                Visibility="{Binding ArrowIconVisibility, Converter={StaticResource VisiblityInvertConverter}}" />
+                                            <ToolTipService.ToolTip>
+                                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                                    <!--  Source folder name  -->
+                                                    <TextBlock
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Text="{Binding SourcePath}" />
 
-                                            <!--  Destination file path  -->
-                                            <TextBlock
-                                                Grid.Column="3"
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Text="{Binding DestinationPath}" />
+                                                    <!--  Arrow icon  -->
+                                                    <FontIcon
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="12"
+                                                        Glyph="&#xEA62;"
+                                                        Visibility="{Binding DestinationLocationVisibility}" />
 
-                                            <!--  '+' icon  -->
-                                            <FontIcon
-                                                Grid.Column="4"
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                FontSize="12"
-                                                Foreground="Lime"
-                                                Glyph="&#xE710;"
-                                                Visibility="{Binding PlusIconVisibility}" />
+                                                    <!--  Destination folder name  -->
+                                                    <TextBlock
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        Text="{Binding DestinationPath}"
+                                                        Visibility="{Binding DestinationLocationVisibility}" />
+                                                </StackPanel>
+                                            </ToolTipService.ToolTip>
                                         </Grid>
-                                    </Border>
-                                </DataTemplate>
-                            </GridView.ItemTemplate>
-                        </GridView>
-                    </Grid>
-                </ScrollViewer>
-            </StackPanel>
-        </Grid>
-    </Border>
+
+                                        <!--  Split with options  -->
+                                        <muxc:SplitButton
+                                            x:Name="Split"
+                                            x:Uid="ConflictingItemsDialogItemDefaultOption"
+                                            Grid.RowSpan="2"
+                                            Grid.Column="2"
+                                            HorizontalAlignment="Right"
+                                            VerticalAlignment="Center"
+                                            Command="{Binding SplitButtonDefaultActionCommand}"
+                                            Content="Generate new name"
+                                            Visibility="{Binding ShowSplitButton}">
+                                            <muxc:SplitButton.Flyout>
+                                                <MenuFlyout>
+                                                    <MenuFlyoutItem
+                                                        x:Uid="ConflictingItemsDialogItemOptionGenerateNewName"
+                                                        Command="{Binding GenerateNewNameCommand}"
+                                                        Text="Generate new name" />
+                                                    <MenuFlyoutItem
+                                                        x:Uid="ConflictingItemsDialogItemOptionReplaceExisting"
+                                                        Command="{Binding ReplaceExistingCommand}"
+                                                        Text="Replace" />
+                                                    <MenuFlyoutItem
+                                                        x:Uid="ConflictingItemsDialogItemOptionSkip"
+                                                        Command="{Binding SkipCommand}"
+                                                        Text="Skip" />
+                                                </MenuFlyout>
+                                            </muxc:SplitButton.Flyout>
+                                        </muxc:SplitButton>
+
+                                        <StackPanel
+                                            Grid.RowSpan="2"
+                                            Grid.Column="2"
+                                            HorizontalAlignment="Right"
+                                            Orientation="Horizontal"
+                                            Spacing="8"
+                                            Visibility="{Binding ShowUndoButton}">
+
+                                            <!--  Undo button  -->
+                                            <HyperlinkButton>
+                                                <HyperlinkButton.Content>
+                                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                                        <FontIcon FontSize="12" Glyph="&#xE10E;" />
+                                                        <TextBlock x:Uid="ConflictingItemsDialogUndoOption" Text="Undo" />
+                                                    </StackPanel>
+                                                </HyperlinkButton.Content>
+                                                <i:Interaction.Behaviors>
+                                                    <!--  No need to specify CommandParameter - `e` is passed by default  -->
+                                                    <icore:EventTriggerBehavior EventName="Click">
+                                                        <icore:InvokeCommandAction Command="{Binding UndoTakenActionCommand}" />
+                                                    </icore:EventTriggerBehavior>
+                                                </i:Interaction.Behaviors>
+                                            </HyperlinkButton>
+
+                                            <!--  Check  -->
+                                            <Grid>
+                                                <Ellipse
+                                                    Width="28"
+                                                    Height="28"
+                                                    Fill="LimeGreen" />
+                                                <FontIcon
+                                                    FontSize="12"
+                                                    Foreground="White"
+                                                    Glyph="&#xE8FB;" />
+                                            </Grid>
+                                        </StackPanel>
+                                    </Grid>
+                                    <Border.ContextFlyout>
+                                        <MenuFlyout Placement="Bottom">
+                                            <MenuFlyoutItem
+                                                x:Uid="ConflictingItemsDialogOptionGenerateNewName"
+                                                Command="{Binding OptionGenerateNewNameCommand}"
+                                                Text="Generate new name" />
+                                            <MenuFlyoutItem
+                                                x:Uid="ConflictingItemsDialogOptionReplaceExisting"
+                                                Command="{Binding OptionReplaceExistingCommand}"
+                                                Text="Replace existing" />
+                                            <MenuFlyoutItem
+                                                x:Uid="ConflictingItemsDialogOptionSkip"
+                                                Command="{Binding OptionSkipCommand}"
+                                                Text="Skip" />
+                                        </MenuFlyout>
+                                    </Border.ContextFlyout>
+                                </Border>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </Grid>
+            </muxc:Expander>
+        </StackPanel>
+    </Grid>
 </ContentDialog>
\ No newline at end of file
diff --git a/Files/Dialogs/FilesystemOperationDialog.xaml.cs b/Files/Dialogs/FilesystemOperationDialog.xaml.cs
index 685fa260de2a..953dfad34f8a 100644
--- a/Files/Dialogs/FilesystemOperationDialog.xaml.cs
+++ b/Files/Dialogs/FilesystemOperationDialog.xaml.cs
@@ -1,11 +1,12 @@
 using Files.ViewModels.Dialogs;
+using System.Collections.Generic;
 using Windows.UI.Xaml.Controls;
 
 // The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
 namespace Files.Dialogs
 {
-    public sealed partial class FilesystemOperationDialog : ContentDialog
+    public sealed partial class FilesystemOperationDialog : ContentDialog, IFilesystemOperationDialogView
     {
         public FilesystemOperationDialogViewModel ViewModel
         {
@@ -13,11 +14,19 @@ public FilesystemOperationDialogViewModel ViewModel
             set => DataContext = value;
         }
 
+        public IList<object> SelectedItems => DetailsGrid.SelectedItems;
+
         public FilesystemOperationDialog(FilesystemOperationDialogViewModel viewModel)
         {
             this.InitializeComponent();
 
             ViewModel = viewModel;
+            ViewModel.View = this;
         }
     }
+
+    public interface IFilesystemOperationDialogView
+    {
+        IList<object> SelectedItems { get; }
+    }
 }
\ No newline at end of file
diff --git a/Files/Enums/FileNameConflictResolveOptionType.cs b/Files/Enums/FileNameConflictResolveOptionType.cs
index 994fd60e0be2..19807a6ee474 100644
--- a/Files/Enums/FileNameConflictResolveOptionType.cs
+++ b/Files/Enums/FileNameConflictResolveOptionType.cs
@@ -1,10 +1,10 @@
 namespace Files.Enums
 {
-    public enum FileNameConflictResolveOptionType
+    public enum FileNameConflictResolveOptionType : uint
     {
-        None = 0,
-        GenerateNewName = 1,
-        ReplaceExisting = 2,
-        Skip = 4
+        GenerateNewName = 0,
+        ReplaceExisting = 1,
+        Skip = 2,
+        NotAConflict = 4
     }
 }
\ No newline at end of file
diff --git a/Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs b/Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
index a5df5e369481..3da6acba684a 100644
--- a/Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
+++ b/Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
@@ -891,7 +891,7 @@ not when file name has changed
             for (int i = 0; i < source.Count(); i++)
             {
                 incomingItems.Add(new FilesystemItemsOperationItemModel(operationType, source.ElementAt(i).Path ?? source.ElementAt(i).Item.Path, destination.ElementAt(i)));
-                collisions.Add(incomingItems.ElementAt(i).SourcePath, FileNameConflictResolveOptionType.None);
+                collisions.Add(incomingItems.ElementAt(i).SourcePath, FileNameConflictResolveOptionType.GenerateNewName);
 
                 if (destination.Count() > 0 && StorageItemHelpers.Exists(destination.ElementAt(i))) // Same item names in both directories
                 {
@@ -915,7 +915,7 @@ not when file name has changed
 
                 if (mustResolveConflicts) // If there were conflicts, result buttons are different
                 {
-                    if (result != ContentDialogResult.Primary && result != ContentDialogResult.Secondary) // Operation was cancelled
+                    if (result != ContentDialogResult.Primary) // Operation was cancelled
                     {
                         return (new List<FileNameConflictResolveOptionType>(), true);
                     }
diff --git a/Files/Helpers/EnumConversionHelpers.cs b/Files/Helpers/EnumConversionHelpers.cs
index 427e6e0e1a23..ad88fdf614fd 100644
--- a/Files/Helpers/EnumConversionHelpers.cs
+++ b/Files/Helpers/EnumConversionHelpers.cs
@@ -27,9 +27,6 @@ public static NameCollisionOption Convert(this FileNameConflictResolveOptionType
         {
             switch (option)
             {
-                case FileNameConflictResolveOptionType.None:
-                    return NameCollisionOption.GenerateUniqueName;
-
                 case FileNameConflictResolveOptionType.GenerateNewName:
                     return NameCollisionOption.GenerateUniqueName;
 
diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw
index d3ccb7d160ab..9c2a6a3d873a 100644
--- a/Files/Strings/en-US/Resources.resw
+++ b/Files/Strings/en-US/Resources.resw
@@ -2034,23 +2034,20 @@
   <data name="DeleteItemsDialogSubtitleMultiple" xml:space="preserve">
     <value>{0} items will be deleted</value>
   </data>
-  <data name="ConflictingItemsDialogCloseButtonText" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
   <data name="ConflictingItemsDialogPrimaryButtonText" xml:space="preserve">
-    <value>Generate new name</value>
+    <value>Continue</value>
   </data>
   <data name="ConflictingItemsDialogSecondaryButtonText" xml:space="preserve">
-    <value>Replace existing</value>
+    <value>Cancel</value>
   </data>
-  <data name="ConflictingItemsDialogSubtitleMultiple" xml:space="preserve">
-    <value>There are {0} conflicting file names, and {1} outgoing item(s)</value>
+  <data name="ConflictingItemsDialogSubtitleMultipleConflictsMultipleNonConflicts" xml:space="preserve">
+    <value>There are {0} conflicting file names, and {1} outgoing item(s).</value>
   </data>
   <data name="ConflictingItemsDialogTitle" xml:space="preserve">
     <value>Conflicting file name(s)</value>
   </data>
-  <data name="ConflictingItemsDialogSubtitleSingle" xml:space="preserve">
-    <value>There is one conflicting file name, and {0} outgoing item(s)</value>
+  <data name="ConflictingItemsDialogSubtitleSingleConflictMultipleNonConflicts" xml:space="preserve">
+    <value>There is one conflicting file name, and {0} outgoing item(s).</value>
   </data>
   <data name="CopyItemsDialogSubtitleSingle" xml:space="preserve">
     <value>One item will be copied</value>
@@ -2094,9 +2091,27 @@
   <data name="NavToolbarManageWidgetsFlyoutHeader.Text" xml:space="preserve">
     <value>Manage Widgets</value>
   </data>
-    <data name="SettingsAppearanceOpenThemesFolderButton.Content" xml:space="preserve">
+  <data name="SettingsAppearanceOpenThemesFolderButton.Content" xml:space="preserve">
     <value>Open themes folder</value>
   </data>
+  <data name="ConflictingItemsDialogItemOptionGenerateNewName.Text" xml:space="preserve">
+    <value>Generate new name</value>
+  </data>
+  <data name="ConflictingItemsDialogItemOptionReplaceExisting.Text" xml:space="preserve">
+    <value>Replace existing</value>
+  </data>
+  <data name="ConflictingItemsDialogItemOptionSkip.Text" xml:space="preserve">
+    <value>Skip</value>
+  </data>
+  <data name="ConflictingItemsDialogOptionGenerateNewName.Text" xml:space="preserve">
+    <value>Generate new name</value>
+  </data>
+  <data name="ConflictingItemsDialogOptionReplaceExisting.Text" xml:space="preserve">
+    <value>Replace existing</value>
+  </data>
+  <data name="ConflictingItemsDialogOptionSkip.Text" xml:space="preserve">
+    <value>Skip</value>
+  </data>
   <data name="SettingsUseNewDetailsView.Header" xml:space="preserve">
     <value>Use new details view</value>
   </data>
@@ -2109,4 +2124,28 @@
   <data name="FileBrowserSortOption_FileType.Text" xml:space="preserve">
     <value>Type</value>
   </data>
+  <data name="FileOperationsDialogDetailsExpander.Header" xml:space="preserve">
+    <value>Details</value>
+  </data>
+  <data name="ConflictingItemsDialogTakenActionGenerateNewName" xml:space="preserve">
+    <value>Generate new name</value>
+  </data>
+  <data name="ConflictingItemsDialogTakenActionReplaceExisting" xml:space="preserve">
+    <value>Replace existing</value>
+  </data>
+  <data name="ConflictingItemsDialogTakenActionSkip" xml:space="preserve">
+    <value>Skip</value>
+  </data>
+  <data name="ConflictingItemsDialogItemDefaultOption.Content" xml:space="preserve">
+    <value>Generate new name</value>
+  </data>
+  <data name="ConflictingItemsDialogUndoOption.Text" xml:space="preserve">
+    <value>Undo</value>
+  </data>
+  <data name="ConflictingItemsDialogSubtitleMultipleConflictsNoNonConflicts" xml:space="preserve">
+    <value>There are {0} conflicting file names.</value>
+  </data>
+  <data name="ConflictingItemsDialogSubtitleSingleConflictNoNonConflicts" xml:space="preserve">
+    <value>There is one conflicting file name.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Files/ViewModels/Dialogs/FilesystemOperationDialogViewModel.cs b/Files/ViewModels/Dialogs/FilesystemOperationDialogViewModel.cs
index edde2c78f1da..56f2e4ae9b5a 100644
--- a/Files/ViewModels/Dialogs/FilesystemOperationDialogViewModel.cs
+++ b/Files/ViewModels/Dialogs/FilesystemOperationDialogViewModel.cs
@@ -4,19 +4,25 @@
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using Microsoft.Toolkit.Uwp;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Input;
+using Windows.UI.Xaml.Controls;
 
 namespace Files.ViewModels.Dialogs
 {
     public class FilesystemOperationDialogViewModel : ObservableObject
     {
-        #region Public Properties
 
         public ObservableCollection<FilesystemOperationItemViewModel> Items { get; private set; }
 
+        public ListViewSelectionMode ItemsSelectionMode
+        {
+            get => MustResolveConflicts ? ListViewSelectionMode.Extended : ListViewSelectionMode.None;
+        }
+
         private string title;
 
         public string Title
@@ -33,6 +39,14 @@ public string Subtitle
             set => SetProperty(ref subtitle, value);
         }
 
+        private bool primaryButtonEnabled = false;
+
+        public bool PrimaryButtonEnabled
+        {
+            get => primaryButtonEnabled;
+            set => SetProperty(ref primaryButtonEnabled, value);
+        }
+
         private string primaryButtonText;
 
         public string PrimaryButtonText
@@ -49,38 +63,6 @@ public string SecondaryButtonText
             set => SetProperty(ref secondaryButtonText, value);
         }
 
-        private string closeButtonText;
-
-        public string CloseButtonText
-        {
-            get => closeButtonText;
-            set => SetProperty(ref closeButtonText, value);
-        }
-
-        private bool chevronUpLoad = false;
-
-        public bool ChevronUpLoad
-        {
-            get => chevronUpLoad;
-            set => SetProperty(ref chevronUpLoad, value);
-        }
-
-        private bool chevronDownLoad = true;
-
-        public bool ChevronDownLoad
-        {
-            get => chevronDownLoad;
-            set => SetProperty(ref chevronDownLoad, value);
-        }
-
-        private bool expandableDetailsLoad = false;
-
-        public bool ExpandableDetailsLoad
-        {
-            get => expandableDetailsLoad;
-            set => SetProperty(ref expandableDetailsLoad, value);
-        }
-
         private bool permanentlyDeleteLoad = false;
 
         public bool PermanentlyDeleteLoad
@@ -113,70 +95,85 @@ public bool MustResolveConflicts
             set => SetProperty(ref mustResolveConflicts, value);
         }
 
-        #endregion Public Properties
-
-        #region Commands
-
-        public ICommand ExpandDetailsCommand { get; private set; }
+        public IFilesystemOperationDialogView View { get; set; }
 
         public ICommand PrimaryButtonCommand { get; private set; }
 
         public ICommand SecondaryButtonCommand { get; private set; }
 
-        public ICommand CloseButtonCommand { get; private set; }
-
-        #endregion Commands
+        public ICommand LoadedCommand { get; private set; }
 
         public FilesystemOperationDialogViewModel()
         {
             // Create commands
             PrimaryButtonCommand = new RelayCommand(PrimaryButton);
             SecondaryButtonCommand = new RelayCommand(SecondaryButton);
-            CloseButtonCommand = new RelayCommand(CloseButton);
+            LoadedCommand = new RelayCommand(() =>
+            {
+                UpdatePrimaryButtonEnabled();
+            });
         }
 
-        #region Command Implementation
-
         private void PrimaryButton()
+        {
+            // Something there?
+        }
+
+        private void SecondaryButton()
         {
             if (MustResolveConflicts)
             {
-                // Generate new name
+                // Replace existing
 
                 foreach (var item in Items)
                 {
-                    item.ConflictResolveOption = FileNameConflictResolveOptionType.GenerateNewName;
+                    // Don't do anything
+                    item.ConflictResolveOption = FileNameConflictResolveOptionType.Skip;
                 }
             }
         }
 
-        private void SecondaryButton()
+        public void OptionSkip()
         {
-            if (MustResolveConflicts)
+            foreach (var item in View.SelectedItems)
             {
-                // Replace existing
+                var detailItem = (FilesystemOperationItemViewModel)item;
 
-                foreach (var item in Items)
-                {
-                    item.ConflictResolveOption = FileNameConflictResolveOptionType.ReplaceExisting;
-                }
+                detailItem.TakeAction(FileNameConflictResolveOptionType.Skip);
             }
         }
 
-        private void CloseButton()
+        public void OptionReplaceExisting()
         {
-            if (MustResolveConflicts)
+            foreach (var item in View.SelectedItems)
             {
-                // Skip
+                var detailItem = (FilesystemOperationItemViewModel)item;
 
-                foreach (var item in Items)
-                {
-                    item.ConflictResolveOption = FileNameConflictResolveOptionType.Skip;
-                }
+                detailItem.TakeAction(FileNameConflictResolveOptionType.ReplaceExisting);
+            }
+        }
+
+        public void OptionGenerateNewName()
+        {
+            foreach (var item in View.SelectedItems)
+            {
+                var detailItem = (FilesystemOperationItemViewModel)item;
+
+                detailItem.TakeAction(FileNameConflictResolveOptionType.GenerateNewName);
             }
         }
 
-        #endregion Command Implementation
+        public void UpdatePrimaryButtonEnabled()
+        {
+            if (MustResolveConflicts)
+            {
+                PrimaryButtonEnabled = !Items.Any((item) => !item.ActionTaken);
+            }
+            else if (PermanentlyDeleteLoad) // PermanentlyDeleteLoad - is only loaded (`true`) when deleting items
+            {
+                PrimaryButtonEnabled = true;
+            }
+        }
 
         public List<IFilesystemOperationItemModel> GetResult()
         {
@@ -189,18 +186,43 @@ public static FilesystemOperationDialog GetDialog(FilesystemItemsOperationDataMo
             string subtitleText = null;
             string primaryButtonText = null;
             string secondaryButtonText = null;
-            string closeButtonText = null;
             bool permanentlyDeleteLoad = false;
 
             if (itemsData.MustResolveConflicts)
             {
                 List<FilesystemItemsOperationItemModel> nonConflictingItems = itemsData.IncomingItems.Except(itemsData.ConflictingItems).ToList();
 
+                // Subtitle text
+                if (itemsData.ConflictingItems.Count > 1)
+                {
+                    if (nonConflictingItems.Count > 0)
+                    {
+                        // There are {0} conflicting file names, and {1} outgoing item(s)
+                        subtitleText = string.Format("ConflictingItemsDialogSubtitleMultipleConflictsMultipleNonConflicts".GetLocalized(), itemsData.ConflictingItems.Count, nonConflictingItems.Count);
+                    }
+                    else
+                    {
+                        // There are {0} conflicting file names
+                        subtitleText = string.Format("ConflictingItemsDialogSubtitleMultipleConflictsNoNonConflicts".GetLocalized(), itemsData.ConflictingItems.Count);
+                    }
+                }    
+                else
+                {
+                    if (nonConflictingItems.Count > 0)
+                    {
+                        // There is one conflicting file name, and {0} outgoing item(s)
+                        subtitleText = string.Format("ConflictingItemsDialogSubtitleSingleConflictMultipleNonConflicts".GetLocalized(), nonConflictingItems.Count);
+                    }
+                    else
+                    {
+                        // There is one conflicting file name
+                        subtitleText = string.Format("ConflictingItemsDialogSubtitleSingleConflictNoNonConflicts".GetLocalized(), itemsData.ConflictingItems.Count);
+                    }
+                }
+
                 titleText = "ConflictingItemsDialogTitle".GetLocalized();
-                subtitleText = itemsData.ConflictingItems.Count == 1 ? string.Format("ConflictingItemsDialogSubtitleSingle".GetLocalized(), nonConflictingItems.Count) : string.Format("ConflictingItemsDialogSubtitleMultiple".GetLocalized(), itemsData.ConflictingItems.Count, nonConflictingItems.Count);
                 primaryButtonText = "ConflictingItemsDialogPrimaryButtonText".GetLocalized();
                 secondaryButtonText = "ConflictingItemsDialogSecondaryButtonText".GetLocalized();
-                closeButtonText = "ConflictingItemsDialogCloseButtonText".GetLocalized();
             }
             else
             {
@@ -242,21 +264,13 @@ public static FilesystemOperationDialog GetDialog(FilesystemItemsOperationDataMo
                 Subtitle = subtitleText,
                 PrimaryButtonText = primaryButtonText,
                 SecondaryButtonText = secondaryButtonText,
-                CloseButtonText = closeButtonText,
                 PermanentlyDeleteLoad = permanentlyDeleteLoad,
                 PermanentlyDelete = itemsData.PermanentlyDelete,
                 PermanentlyDeleteEnabled = itemsData.PermanentlyDeleteEnabled,
-                MustResolveConflicts = itemsData.MustResolveConflicts,
-                ExpandDetailsCommand = new RelayCommand<FilesystemOperationDialogViewModel>((vm) =>
-                {
-                    bool detailsShown = !vm.ExpandableDetailsLoad; // Inverted
-
-                    vm.ExpandableDetailsLoad = detailsShown;
-                    vm.ChevronDownLoad = !detailsShown;
-                    vm.ChevronUpLoad = detailsShown;
-                }),
-                Items = new ObservableCollection<FilesystemOperationItemViewModel>(itemsData.ToItems())
+                MustResolveConflicts = itemsData.MustResolveConflicts
             };
+            viewModel.Items = new ObservableCollection<FilesystemOperationItemViewModel>(itemsData.ToItems(
+                viewModel.UpdatePrimaryButtonEnabled, viewModel.OptionGenerateNewName, viewModel.OptionReplaceExisting, viewModel.OptionSkip));
 
             FilesystemOperationDialog dialog = new FilesystemOperationDialog(viewModel);
 
diff --git a/Files/ViewModels/Dialogs/FilesystemOperationItemViewModel.cs b/Files/ViewModels/Dialogs/FilesystemOperationItemViewModel.cs
index 8ddf68269793..f18652d5705f 100644
--- a/Files/ViewModels/Dialogs/FilesystemOperationItemViewModel.cs
+++ b/Files/ViewModels/Dialogs/FilesystemOperationItemViewModel.cs
@@ -1,48 +1,79 @@
 using Files.Enums;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using Microsoft.Toolkit.Uwp;
+using System;
+using System.Windows.Input;
 using Windows.UI.Xaml;
 
 namespace Files.ViewModels.Dialogs
 {
     public class FilesystemOperationItemViewModel : ObservableObject, IFilesystemOperationItemModel
     {
+        private readonly Action updatePrimaryButtonEnabled;
+
         public string OperationIconGlyph { get; set; }
 
         public string SourcePath { get; set; }
 
-        public Visibility PlusIconVisibility { get; set; } // Item will be created - show plus icon
-
         public string DestinationPath { get; set; }
 
-        private bool isConflicting = false;
+        private bool isConflict;
+        public bool IsConflict
+        {
+            get => isConflict;
+            set => SetProperty(ref isConflict, value);
+        }
+
+        public string SourceDirectoryDisplayName
+        {
+            // If the destination path is empty, then show full source path instead
+            get => !string.IsNullOrEmpty(DestinationPath) ? System.IO.Path.GetFileName(System.IO.Path.GetDirectoryName(SourcePath)) : System.IO.Path.GetDirectoryName(SourcePath);
+        }
+
+        public string DestinationDirectoryDisplayName
+        {
+            get => System.IO.Path.GetFileName(System.IO.Path.GetDirectoryName(DestinationPath));
+        }
+
+        public string DisplayFileName
+        {
+            get => string.IsNullOrEmpty(DestinationPath) ? System.IO.Path.GetFileName(SourcePath) : System.IO.Path.GetFileName(DestinationPath);
+        }
 
-        /// <summary>
-        /// Determines whether an item is or was a conflicting one
-        /// <br/>
-        /// <br/>
-        /// If the item is no longer a conflicting file name, this property value should NOT be changed.
-        /// </summary>
-        public bool IsConflicting
+        public string TakenActionText
         {
-            get => isConflicting;
-            set
+            get
             {
-                if (isConflicting != value)
+                switch (ConflictResolveOption)
                 {
-                    isConflicting = value;
+                    case FileNameConflictResolveOptionType.GenerateNewName:
+                        {
+                            return "ConflictingItemsDialogTakenActionGenerateNewName".GetLocalized();
+                        }
 
-                    ExclamationMarkVisibility = isConflicting ? Visibility.Visible : Visibility.Collapsed;
-                    ArrowIconVisibility = isConflicting ? Visibility.Collapsed : Visibility.Visible;
+                    case FileNameConflictResolveOptionType.ReplaceExisting:
+                        {
+                            return "ConflictingItemsDialogTakenActionReplaceExisting".GetLocalized();
+                        }
+
+                    case FileNameConflictResolveOptionType.Skip:
+                        {
+                            return "ConflictingItemsDialogTakenActionSkip".GetLocalized();
+                        }
+
+                    case FileNameConflictResolveOptionType.NotAConflict:
+                    default:
+                        {
+                            return "Not a conflict";
+                        }
                 }
             }
         }
 
-        private Visibility arrowIconVisibility = Visibility.Visible;
-
-        public Visibility ArrowIconVisibility
+        public Visibility DestinationLocationVisibility
         {
-            get => arrowIconVisibility;
-            set => SetProperty(ref arrowIconVisibility, value);
+            get => string.IsNullOrEmpty(DestinationPath) ? Visibility.Collapsed : Visibility.Visible;
         }
 
         private Visibility exclamationMarkVisibility = Visibility.Collapsed;
@@ -53,20 +84,82 @@ public Visibility ExclamationMarkVisibility
             set => SetProperty(ref exclamationMarkVisibility, value);
         }
 
-        private FileNameConflictResolveOptionType conflictResolveOption = FileNameConflictResolveOptionType.None;
+        public FileNameConflictResolveOptionType ConflictResolveOption { get; set; }
 
-        public FileNameConflictResolveOptionType ConflictResolveOption
+        private bool actionTaken = false;
+        public bool ActionTaken
         {
-            get => conflictResolveOption;
-            set
-            {
-                if (conflictResolveOption != value && IsConflicting)
-                {
-                    conflictResolveOption = value;
-                }
-            }
+            get => actionTaken;
+            set => SetProperty(ref actionTaken, value);
+        }
+
+        public Visibility ShowSubFolders
+        {
+            get => string.IsNullOrEmpty(DestinationPath) || !IsConflict || (!ActionTaken && ConflictResolveOption != FileNameConflictResolveOptionType.NotAConflict) ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public Visibility ShowResolveOption
+        {
+            get => ActionTaken && ConflictResolveOption != FileNameConflictResolveOptionType.NotAConflict ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public Visibility ShowUndoButton
+        {
+            get => ActionTaken && ConflictResolveOption != FileNameConflictResolveOptionType.NotAConflict ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public Visibility ShowSplitButton
+        {
+            get => !ActionTaken && ConflictResolveOption != FileNameConflictResolveOptionType.NotAConflict ? Visibility.Visible : Visibility.Collapsed;
         }
 
         public FilesystemOperationType ItemOperation { get; set; }
+
+        public ICommand GenerateNewNameCommand { get; private set; }
+
+        public ICommand ReplaceExistingCommand { get; private set; }
+
+        public ICommand SkipCommand { get; private set; }
+
+        public ICommand SplitButtonDefaultActionCommand { get; private set; }
+
+        public ICommand UndoTakenActionCommand { get; private set; }
+
+        public ICommand OptionGenerateNewNameCommand { get; private set; }
+
+        public ICommand OptionReplaceExistingCommand { get; private set; }
+
+        public ICommand OptionSkipCommand { get; private set; }
+
+        public FilesystemOperationItemViewModel(Action updatePrimaryButtonEnabled, Action optionGenerateNewName, Action optionReplaceExisting, Action optionSkip)
+        {
+            this.updatePrimaryButtonEnabled = updatePrimaryButtonEnabled;
+
+            GenerateNewNameCommand = new RelayCommand(() => TakeAction(FileNameConflictResolveOptionType.GenerateNewName));
+            ReplaceExistingCommand = new RelayCommand(() => TakeAction(FileNameConflictResolveOptionType.ReplaceExisting));
+            SkipCommand = new RelayCommand(() => TakeAction(FileNameConflictResolveOptionType.Skip));
+            SplitButtonDefaultActionCommand = new RelayCommand(() => TakeAction(FileNameConflictResolveOptionType.GenerateNewName)); // GenerateNewName is the default action
+            UndoTakenActionCommand = new RelayCommand<RoutedEventArgs>((e) => TakeAction(FileNameConflictResolveOptionType.GenerateNewName, false));
+
+            OptionGenerateNewNameCommand = new RelayCommand(optionGenerateNewName);
+            OptionReplaceExistingCommand = new RelayCommand(optionReplaceExisting);
+            OptionSkipCommand = new RelayCommand(optionSkip);
+        }
+
+        public void TakeAction(FileNameConflictResolveOptionType action, bool actionTaken = true)
+        {
+            if (IsConflict)
+            {
+                ConflictResolveOption = action;
+                ActionTaken = actionTaken;
+                ExclamationMarkVisibility = actionTaken ? Visibility.Collapsed : Visibility.Visible;
+                OnPropertyChanged(nameof(ShowSubFolders));
+                OnPropertyChanged(nameof(ShowResolveOption));
+                OnPropertyChanged(nameof(ShowUndoButton));
+                OnPropertyChanged(nameof(ShowSplitButton));
+                OnPropertyChanged(nameof(TakenActionText));
+                this.updatePrimaryButtonEnabled?.Invoke();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Files/ViewModels/Dialogs/IFilesystemOperationItemModel.cs b/Files/ViewModels/Dialogs/IFilesystemOperationItemModel.cs
index 62dfc9a8b431..2d430c3bb00b 100644
--- a/Files/ViewModels/Dialogs/IFilesystemOperationItemModel.cs
+++ b/Files/ViewModels/Dialogs/IFilesystemOperationItemModel.cs
@@ -8,8 +8,6 @@ public interface IFilesystemOperationItemModel
 
         string DestinationPath { get; }
 
-        bool IsConflicting { get; }
-
         FileNameConflictResolveOptionType ConflictResolveOption { get; }
 
         FilesystemOperationType ItemOperation { get; }