fix merge issues.

samples/ControlCatalog/Pages/ContextMenuPage.xaml

@@ -41,7 +41,6 @@
                           IsHitTestVisible="False" />
               </MenuItem.Icon>
             </MenuItem>
-            <MenuItem Header="Menu Item that won't close on click" StaysOpenOnClick="True" />
           </ContextMenu>
         </Border.ContextMenu>
         <TextBlock Text="Defined in XAML" />

tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs

@@ -577,19 +577,6 @@ namespace Avalonia.Controls.UnitTests
             return w;
         }
 
-        private Window PreparedWindow(object content = null)
-        {
-            var renderer = new Mock<IRenderer>();
-            var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
-            var windowImpl = Mock.Get(platform.CreateWindow());
-            windowImpl.Setup(x => x.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer.Object);
-
-            var w = new Window(windowImpl.Object) { Content = content };
-            w.ApplyTemplate();
-            w.Presenter.ApplyTemplate();
-            return w;
-        }
-
         private IDisposable Application()
         {
             var screen = new PixelRect(new PixelPoint(), new PixelSize(100, 100));