Fix merge conflict

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>

diff --cc src/gui/CMakeLists.txt
index 35102e0cca90505f1ea485acf76949b8e320edaa,dbfc10214969d28733079dfa44b4937a65e0b6c4..9b0455a6b5bdc2d5d8488a293415c22d2685c43f
--- 1/src/gui/CMakeLists.txt
--- 2/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@@ -35,8 -35,7 +35,9 @@@ set(client_UI_SRC
      addcertificatedialog.ui
      proxyauthdialog.ui
      mnemonicdialog.ui
 +    tray/window.qml
 +    tray/UserLine.qml
+     wizard/flow2authwidget.ui
      wizard/owncloudadvancedsetuppage.ui
      wizard/owncloudconnectionmethoddialog.ui
      wizard/owncloudhttpcredspage.ui
@@@ -105,9 -102,9 +104,10 @@@ set(client_SRC
      servernotificationhandler.cpp
      guiutility.cpp
      elidedlabel.cpp
+     headerbanner.cpp
      iconjob.cpp
      remotewipe.cpp
 +    tray/UserModel.cpp
      creds/credentialsfactory.cpp
      creds/httpcredentialsgui.cpp
      creds/oauth.cpp

diff --cc src/gui/accountsettings.cpp
index 1bbf7ee1063f04bd5183e0345b538726981e885c,e79ff3463c7684320008111ac8fc89d8cc6adbd8..a7fd0f5a17732808ed73c5eb2ecc290b35b46d45
--- 1/src/gui/accountsettings.cpp
--- 2/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@@ -228,14 -227,11 +230,14 @@@ void AccountSettings::createAccountTool
  
      QAction *action = new QAction(tr("Remove"), this);
      menu->addAction(action);
 +
      connect(action, &QAction::triggered, this, &AccountSettings::slotDeleteAccount);
 +    connect(UserModel::instance(), &UserModel::removeAccount,
 +        this, &AccountSettings::slotOpenAccountWizard);
  
-     ui->_accountToolbox->setText(tr("Account") + QLatin1Char(' '));
-     ui->_accountToolbox->setMenu(menu);
-     ui->_accountToolbox->setPopupMode(QToolButton::InstantPopup);
+     _ui->_accountToolbox->setText(tr("Account") + QLatin1Char(' '));
+     _ui->_accountToolbox->setMenu(menu);
+     _ui->_accountToolbox->setPopupMode(QToolButton::InstantPopup);
  
      slotAccountAdded(_accountState);
  }

diff --cc src/gui/owncloudgui.cpp
Simple merge

diff --cc src/gui/settingsdialog.cpp
Simple merge