mainwindow merge fixed