solved merge conflicts
removed MainWindow class since it is not being used