chore(Listboard): Solve Merge conflicts

Author: DevTKSS

src/DevTKSS.Uno.Samples.MvuxGallery/Presentation/ViewModels/ListboardModel.cs

@@ -59,15 +59,15 @@ public ListboardModel(
     /// </remarks>
     public IListFeed<string> CodeSampleOptions => ListFeed<string>
                                                       .Async(_codeSampleService.GetCodeSampleOptionsAsync)
-                                                      .Selection(SelectedSampleOption);
+                                                      .Selection(SelectedOption);
 
     /// <summary>
     /// Represents the selected code sample option.
     /// </summary>
     /// <remarks>
     /// Uses <see cref="string.Empty"/> as the default value to avoid null checks in the XAML.
     /// </remarks>
-    public IState<string> SelectedSampleOption => State<string>
+    public IState<string> SelectedOption => State<string>
                                                     .Value(this, () => string.Empty)
                                                     .ForEach(SwitchCodeSampleAsync);
 

src/DevTKSS.Uno.Samples.MvuxGallery/Presentation/Views/ListboardPage.xaml

@@ -18,8 +18,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"
-                           MaxHeight="300" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
         <TextBlock Grid.Row="0"