diff --git a/tabs/ports.html b/tabs/ports.html
index 7132e23e..70df8361 100644
--- a/tabs/ports.html
+++ b/tabs/ports.html
@@ -1,5 +1,4 @@
 <div class="tab-ports">
-<<<<<<< HEAD
   <div class="tab_title" i18n="tabPorts">Ports</div>
   <div class="cf_doc_version_bt">
     <a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
@@ -10,37 +9,6 @@
         <p i18n="portsHelp"></p>
         <p i18n="portsMSPHelp"></p>
       </div>
-=======
-    <div class="require-support">
-        <div class="help">
-            <p i18n="portsHelp"></p>
-        </div>
-        <table class="ports">
-            <thead>
-                <tr>
-                    <td>Identifier</td>
-                    <td>Data</td>
-                    <td>Logging</td>
-                    <td>Telemetry</td>
-                    <td>RX</td>
-                    <td>GPS</td>
-                </tr>
-            </thead>
-            <tbody>
-            </tbody>
-        </table>
-        
-        <div class="help">
-            <p i18n="portsMSPHelp"></p>
-        </div>
-        
-        <div class="clear-both"></div>
-        <div class="buttons">
-            <a class="save" href="#" i18n="portsButtonSave"></a>
-        </div>
-    </div>
-    <div class="note require-upgrade" i18n="portsFirmwareUpgradeRequired">
->>>>>>> cleanflight/development
     </div>
     <table class="ports" style="margin-bottom:20px;">
       <thead>
diff --git a/tabs/setup.html b/tabs/setup.html
index 4b218035..57a6057c 100644
--- a/tabs/setup.html
+++ b/tabs/setup.html
@@ -36,8 +36,7 @@
     <div class="spacer_right">
       <div class="model-and-info">
         <div id="interactive_block">
-<<<<<<< HEAD
-          <div id="canvas_wrapper" style="">
+          <div id="canvas_wrapper">
             <canvas id="canvas"></canvas>
             <div class="attitude_info">
               <dl>
@@ -48,29 +47,6 @@
                 <dt>Roll:</dt>
                 <dd class="roll">&nbsp;</dd>
               </dl>
-=======
-            <div id="canvas_wrapper">
-                <canvas id="canvas"></canvas>
-            </div>
-            <div class="attitude">
-                <dl>
-                    <dt>Heading:</dt><dd class="heading">&nbsp;</dd>
-                    <dt>Pitch:</dt><dd class="pitch">&nbsp;</dd>
-                    <dt>Roll:</dt><dd class="roll">&nbsp;</dd>
-                </dl>
-            </div>
-            <a class="reset" href="#" i18n="initialSetupButtonResetZaxis"></a>
-        </div>
-        <div class="block info">
-            <span class="head" i18n="initialSetupInfoHead"></span>
-            <div class="fields">
-                <dl>
-                    <dt i18n="initialSetupBattery"></dt><dd class="bat-voltage">0 V</dd>
-                    <dt i18n="initialSetupDrawn"></dt><dd class="bat-mah-drawn">0 mAh</dd>
-                    <dt i18n="initialSetupDrawing"></dt><dd class="bat-mah-drawing">0 A</dd>
-                    <dt i18n="initialSetupRSSI"></dt><dd class="rssi">0 %</dd>
-                </dl>
->>>>>>> cleanflight/development
             </div>
           </div>
           <a class="reset" href="#" i18n="initialSetupButtonResetZaxis"></a>