MainWindow merge conflict fix