diff --git a/UpdatePTUDevCtrl/mainwindow.cpp b/UpdatePTUDevCtrl/mainwindow.cpp
index 7fe8487..c17b24d 100644
--- a/UpdatePTUDevCtrl/mainwindow.cpp
+++ b/UpdatePTUDevCtrl/mainwindow.cpp
@@ -27,6 +27,7 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     , m_updateStep(UpdateDcEvent::UpdateStep::NONE) {
 
     ui->setupUi(this);
+    checkOrientation();
 
     this->setStatusBar(new QStatusBar(this));
     QFont f;
@@ -36,12 +37,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     f.setPointSize(11);
     this->statusBar()->setFont(f);
 
-<<<<<<< HEAD
-    ui->setupUi(this);
-    checkOrientation();
-
-=======
->>>>>>> 7bfb7f5... save for christmas
     ui->updateProgress->setRange(0, 100);
     ui->updateProgress->reset();