diff --git a/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml b/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml
index f207273..f75d7ae 100644
--- a/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml
+++ b/src/ClaudeDo.Ui/Views/Planning/ConflictResolutionView.axaml
@@ -28,20 +28,20 @@
 
     <!-- Content -->
     <StackPanel Spacing="12" Margin="16" MinWidth="520">
-      <TextBlock FontWeight="SemiBold" FontSize="{StaticResource FontSizeH3}"
+      <TextBlock Classes="heading"
                  Text="{Binding SubtaskTitle, StringFormat='Conflicts in subtask: {0}'}"/>
-      <TextBlock Text="{Binding TargetBranch, StringFormat='Merging into: {0}'}" Opacity="0.7"/>
+      <TextBlock Classes="body" Text="{Binding TargetBranch, StringFormat='Merging into: {0}'}"/>
       <ItemsControl ItemsSource="{Binding ConflictedFiles}">
         <ItemsControl.ItemTemplate>
           <DataTemplate>
-            <TextBlock Text="{Binding}" FontFamily="{DynamicResource MonoFont}"/>
+            <TextBlock Classes="path-mono" Text="{Binding}"/>
           </DataTemplate>
         </ItemsControl.ItemTemplate>
       </ItemsControl>
-      <TextBlock Text="{Binding VsCodeError}" Foreground="{DynamicResource BloodBrush}"
+      <TextBlock Classes="meta" Text="{Binding VsCodeError}" Foreground="{DynamicResource BloodBrush}"
                  IsVisible="{Binding VsCodeError, Converter={x:Static ObjectConverters.IsNotNull}}"
                  TextWrapping="Wrap"/>
-      <TextBlock Text="{Binding ActionError}" Foreground="{DynamicResource BloodBrush}"
+      <TextBlock Classes="meta" Text="{Binding ActionError}" Foreground="{DynamicResource BloodBrush}"
                  IsVisible="{Binding ActionError, Converter={x:Static ObjectConverters.IsNotNull}}"
                  TextWrapping="Wrap"/>
     </StackPanel>