[TD]fix merge conflicts

src/Mod/TechDraw/Gui/QGITile.cpp

@@ -29,6 +29,8 @@
 #include <QFileInfo>
 #endif
 
+#include <qmath.h>
+
 #include <App/Application.h>
 #include <App/Material.h>
 #include <Base/Console.h>
@@ -36,17 +38,18 @@
 #include <Base/Tools.h>
 
 #include <Mod/TechDraw/App/DrawUtil.h>
-//#include <Mod/TechDraw/App/Preferences.h>
 #include <Mod/TechDraw/App/DrawTile.h>
 #include <Mod/TechDraw/App/DrawTileWeld.h>
 #include <Mod/TechDraw/App/DrawWeldSymbol.h>
 
-#include <qmath.h>
 #include "Rez.h"
 #include "PreferencesGui.h"
 #include "DrawGuiUtil.h"
 #include "QGIView.h"
 #include "QGIWeldSymbol.h"
+#include "QGCustomSvg.h"
+#include "QGCustomText.h"
+
 #include "QGITile.h"
 
 using namespace TechDrawGui;

src/Mod/TechDraw/Gui/QGTracker.h

@@ -34,6 +34,7 @@ class QStyleOptionGraphicsItem;
 QT_END_NAMESPACE
 
 #include <Base/Parameter.h>
+#include <Base/Vector3D.h>
 
 #include "QGIPrimPath.h"
 
@@ -89,8 +90,6 @@ protected:
     void hoverMoveEvent(QGraphicsSceneHoverEvent* event) override;
     void keyPressEvent(QKeyEvent * event) override;
 
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
-
     void getPickedQGIV(QPointF pos);
 
     QColor getTrackerColor();