Fix merge conflicts

src/widgets/splits/Split.cpp

@@ -52,7 +52,7 @@ namespace {
                            const QString &title, const QString &description)
     {
         auto window =
-            new BaseWindow(parent, BaseWindow::Flags::EnableCustomFrame);
+            new BaseWindow(BaseWindow::Flags::EnableCustomFrame, parent);
         window->setWindowTitle("Chatterino - " + title);
         window->setAttribute(Qt::WA_DeleteOnClose);
         auto layout = new QVBoxLayout();