diff --git a/contrib/grpc b/contrib/grpc
index c1d176528fd..8aea4e168e7 160000
--- a/contrib/grpc
+++ b/contrib/grpc
@@ -1 +1 @@
-Subproject commit c1d176528fd8da9dd4066d16554bcd216d29033f
+Subproject commit 8aea4e168e78f3eb9828080740fc8cb73d53bf79
diff --git a/contrib/jemalloc b/contrib/jemalloc
index cd2931ad9bb..ea6b3e973b4 160000
--- a/contrib/jemalloc
+++ b/contrib/jemalloc
@@ -1 +1 @@
-Subproject commit cd2931ad9bbd78208565716ab102e86d858c2fff
+Subproject commit ea6b3e973b477b8061e0076bb257dbd7f3faa756
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 77dc5305fa8..ce1d35e65d4 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -59,13 +59,7 @@
 #include <Server/TCPHandlerFactory.h>
 #include <Common/SensitiveDataMasker.h>
 #include <Common/ThreadFuzzer.h>
-<<<<<<< HEAD
-#include "MySQLHandlerFactory.h"
-#include <daemon/SentryWriter.h>
-
-=======
 #include <Server/MySQLHandlerFactory.h>
->>>>>>> a4e40fb5f209539cfee6af5da7f27c1c96e02eac
 
 #if !defined(ARCADIA_BUILD)
 #   include "config_core.h"