diff --git a/mainwindow.ui b/mainwindow.ui
index d2c1a3df050d6070019700d0293199c7a9862239..9c7896f3517f3c952e95e215c2f61b78da80f8a7 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MainWindow</class>
@@ -328,229 +327,4 @@
   <include location="qrc.qrc"/>
  </resources>
  <connections/>
-</ui>
-
-        </property>
-        <property name="text">
-          <string>选择固件文件</string>
-        </property>
-      </widget>
-      <widget class="QLabel" name="label_6">
-        <property name="geometry">
-          <rect>
-            <x>10</x>
-            <y>290</y>
-            <width>51</width>
-            <height>31</height>
-          </rect>
-        </property>
-        <property name="styleSheet">
-          <string notr="true">font: 12pt;</string>
-        </property>
-        <property name="text">
-          <string>信息:</string>
-        </property>
-      </widget>
-      <widget class="QLineEdit" name="lineEdit_FileName">
-        <property name="geometry">
-          <rect>
-            <x>30</x>
-            <y>140</y>
-            <width>261</width>
-            <height>31</height>
-          </rect>
-        </property>
-      </widget>
-      <widget class="QComboBox" name="comboBox_device">
-        <property name="geometry">
-          <rect>
-            <x>30</x>
-            <y>90</y>
-            <width>261</width>
-            <height>31</height>
-          </rect>
-        </property>
-      </widget>
-      <widget class="QProgressBar" name="progressBar_Download_Speed">
-        <property name="geometry">
-          <rect>
-            <x>10</x>
-            <y>270</y>
-            <width>421</width>
-            <height>21</height>
-          </rect>
-        </property>
-        <property name="font">
-          <font>
-            <pointsize>12</pointsize>
-            <weight>9</weight>
-            <italic>false</italic>
-            <bold>false</bold>
-          </font>
-        </property>
-        <property name="styleSheet">
-          <string notr="true">font: 75 12pt;</string>
-        </property>
-        <property name="value">
-          <number>0</number>
-        </property>
-      </widget>
-      <widget class="QLabel" name="label">
-        <property name="geometry">
-          <rect>
-            <x>10</x>
-            <y>235</y>
-            <width>81</width>
-            <height>31</height>
-          </rect>
-        </property>
-        <property name="styleSheet">
-          <string notr="true">font: 75 12pt;</string>
-        </property>
-        <property name="text">
-          <string>下载进度:</string>
-        </property>
-      </widget>
-      <widget class="QPushButton" name="pushButton_openclose">
-        <property name="enabled">
-          <bool>true</bool>
-        </property>
-        <property name="geometry">
-          <rect>
-            <x>300</x>
-            <y>90</y>
-            <width>111</width>
-            <height>31</height>
-          </rect>
-        </property>
-        <property name="font">
-          <font>
-            <pointsize>12</pointsize>
-            <weight>75</weight>
-            <bold>true</bold>
-          </font>
-        </property>
-        <property name="text">
-          <string>连接下载器</string>
-        </property>
-      </widget>
-      <widget class="QWidget" name="layoutWidget">
-        <property name="geometry">
-          <rect>
-            <x>20</x>
-            <y>180</y>
-            <width>401</width>
-            <height>51</height>
-          </rect>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-            <widget class="QPushButton" name="pushButton_GetMCUID">
-              <property name="enabled">
-                <bool>false</bool>
-              </property>
-              <property name="minimumSize">
-                <size>
-                  <width>0</width>
-                  <height>31</height>
-                </size>
-              </property>
-              <property name="styleSheet">
-                <string notr="true">font: 75 12pt;</string>
-              </property>
-              <property name="text">
-                <string>查询设备</string>
-              </property>
-            </widget>
-          </item>
-          <item>
-            <widget class="QPushButton" name="pushButton_emptyFlash">
-              <property name="enabled">
-                <bool>false</bool>
-              </property>
-              <property name="minimumSize">
-                <size>
-                  <width>0</width>
-                  <height>31</height>
-                </size>
-              </property>
-              <property name="font">
-                <font>
-                  <pointsize>12</pointsize>
-                  <weight>9</weight>
-                  <italic>false</italic>
-                  <bold>false</bold>
-                </font>
-              </property>
-              <property name="styleSheet">
-                <string notr="true">font: 75 12pt;</string>
-              </property>
-              <property name="text">
-                <string>擦除固件</string>
-              </property>
-            </widget>
-          </item>
-          <item>
-            <widget class="QPushButton" name="pushButton_StartDownload">
-              <property name="enabled">
-                <bool>false</bool>
-              </property>
-              <property name="minimumSize">
-                <size>
-                  <width>0</width>
-                  <height>31</height>
-                </size>
-              </property>
-              <property name="font">
-                <font>
-                  <pointsize>12</pointsize>
-                  <weight>9</weight>
-                  <italic>false</italic>
-                  <bold>false</bold>
-                </font>
-              </property>
-              <property name="styleSheet">
-                <string notr="true">font: 75 12pt;</string>
-              </property>
-              <property name="text">
-                <string>单次运行</string>
-              </property>
-            </widget>
-          </item>
-          <item>
-            <widget class="QPushButton" name="pushButton_StartDownloadFlash">
-              <property name="enabled">
-                <bool>false</bool>
-              </property>
-              <property name="minimumSize">
-                <size>
-                  <width>0</width>
-                  <height>31</height>
-                </size>
-              </property>
-              <property name="font">
-                <font>
-                  <pointsize>12</pointsize>
-                  <weight>9</weight>
-                  <italic>false</italic>
-                  <bold>false</bold>
-                </font>
-              </property>
-              <property name="styleSheet">
-                <string notr="true">font: 75 12pt;</string>
-              </property>
-              <property name="text">
-                <string>烧录固件</string>
-              </property>
-            </widget>
-          </item>
-        </layout>
-      </widget>
-    </widget>
-    <widget class="QStatusBar" name="statusbar"/>
-  </widget>
-  <resources>
-    <include location="qrc.qrc"/>
-  </resources>
-  <connections/>
-</ui>
+</ui>
\ No newline at end of file