Fix conflict

launcher/InstanceCreationTask.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "tasks/Task.h"
+#include "net/NetJob.h"
+#include <QUrl>
+#include "settings/SettingsObject.h"
+#include "BaseVersion.h"
+#include "InstanceTask.h"
+
+class InstanceCreationTask : public InstanceTask
+{
+    Q_OBJECT
+public:
+    explicit InstanceCreationTask(BaseVersionPtr version);
+
+protected:
+    //! Entry point for tasks.
+    virtual void executeTask() override;
+
+private: /* data */
+    BaseVersionPtr m_version;
+};