fix build

src/discord/voiceclient.cpp

@@ -18,7 +18,7 @@
 // clang-format on
 
 UDPSocket::UDPSocket()
-    : m_socket(INVALID_SOCKET) {
+    : m_socket(-1) {
 }
 
 UDPSocket::~UDPSocket() {

src/windows/mainwindow.hpp

@@ -3,11 +3,11 @@
 #include "components/chatwindow.hpp"
 #include "components/memberlist.hpp"
 #include "components/friendslist.hpp"
-<<<<<<< HEAD
 #include "components/voiceinfobox.hpp"
-#include <gtkmm.h>
-=======
->>>>>>> master
+#include <gtkmm/window.h>
+#include <gtkmm/stack.h>
+#include <gtkmm/menubar.h>
+#include <gtkmm/checkmenuitem.h>
 
 class MainWindow : public Gtk::Window {
 public: