Fix conflict mess

src/FlightDisplay/FlightDisplayViewWidgets.qml

@@ -155,11 +155,6 @@ Item {
         anchors.top:            parent.top
         anchors.topMargin:      QGroundControl.corePlugin.options.instrumentWidget.widgetTopMargin + (ScreenTools.defaultFontPixelHeight * 0.5)
         anchors.margins:        ScreenTools.defaultFontPixelHeight * 0.5
-
-    //-- Instrument Panel
-    Loader {
-        id:                     instrumentsLoader
-        anchors.margins:        ScreenTools.defaultFontPixelHeight / 2
         anchors.right:          parent.right
         //-------------------------------------------------------
         // Airmap Airspace Control
@@ -177,10 +172,6 @@ Item {
             anchors.margins:            ScreenTools.defaultFontPixelHeight * 0.5
             property var  qgcView:      widgetRoot.qgcView
             property real maxHeight:    widgetRoot ? widgetRoot.height - instrumentsColumn.y - airspaceControl.height - (ScreenTools.defaultFontPixelHeight * 4) : 0
-        }
-        z:                      QGroundControl.zOrderWidgets
-        property var  qgcView:  _root.qgcView
-        property real maxHeight:parent.height - (anchors.margins * 2)
             states: [
                 State {
                     name:   "topRightMode"
@@ -250,4 +241,5 @@ Item {
                 }
             ]
         }
+    }
 }