15-jul
resolved conflict MainWindow.xaml