resolve conflict

src/mainwindow.cpp

@@ -147,10 +147,6 @@ MainWindow::MainWindow(QWidget* parent) :
 	tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 	QVBoxLayout* layout = new QVBoxLayout(this);
 	layout->setMargin(0);
-    layout->setSpacing(0);
-    QWidget * top = new TopBarWidget(this);
-    top->setObjectName("topbarWidget");
-	layout->addWidget(top);
 	layout->addWidget(tab);
 
 	ui->centralWidget->setLayout(layout);
@@ -270,7 +266,8 @@ void MainWindow::centerWidgetShow() {
 			AdminSettingForm* form = new AdminSettingForm(this);
 			admin_tab_index = tab->addTab(form, "Admin");
 		}
-    } else{
+	}
+	else {
 		if (admin_tab_index != -1) {
 			tab->removeTab(admin_tab_index);
 			admin_tab_index = -1;