Fixed MainWindow incorrect merge