resolve conflicts DesktopWindow.xaml