fixed merge errors

Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs

@@ -39,7 +39,13 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
         {
             InitializeComponent();
             Suspending += OnSuspending;
-            HockeyClient.Current.Configure(string.Empty);
+            try
+            {
+                HockeyClient.Current.Configure(string.Empty);
+            }
+            catch
+            {
+            }
         }
 
         protected override async void OnActivated(IActivatedEventArgs args)

Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml

@@ -130,7 +130,7 @@
                                            Visibility="{x:Bind local:About.VisibleIfCollectionEmpty(RecentSamples), Mode=OneWay}"></TextBlock>
                                     <ItemsControl x:Name="RecentSamplesItemsControl"
                                                   ItemsPanel="{StaticResource ItemsWrapGridHorizontalTemplate}"
-                                                  ItemsSource="{x:Bind RecentSamples, Mode=OneWay}" ItemTemplate="{StaticResource SampleTemplate}">
+                                                  ItemsSource="{x:Bind RecentSamples, Mode=OneWay}" ItemTemplate="{StaticResource RecentSampleTemplate}">
                                     </ItemsControl>
                                 </Grid>