Merge master and fix conflicts

1 files changed, 2 insertions, 2 deletions

diff --git a/src/dialogs/InviteUsers.h b/src/dialogs/InviteUsers.h

index 952c97a5..684f60b4 100644
--- a/src/dialogs/InviteUsers.h
+++ b/src/dialogs/InviteUsers.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <QFrame>
-#include <QLabel>
-#include <QListWidgetItem>
 #include <QStringList>
 
 class QPushButton;
+class QLabel;
 class TextField;
 class QListWidget;
+class QListWidgetItem;
 
 namespace dialogs {