diff --git a/dbms/programs/server/TCPHandler.cpp b/dbms/programs/server/TCPHandler.cpp
index 7014e55d99b..91dc44d4b94 100644
--- a/dbms/programs/server/TCPHandler.cpp
+++ b/dbms/programs/server/TCPHandler.cpp
@@ -29,11 +29,6 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Compression/CompressionFactory.h>
 #include <common/logger_useful.h>
-<<<<<<< HEAD
-=======
-
-#include <iostream>
->>>>>>> aa54091152... bugfix client logs + some tests
 
 #include "TCPHandler.h"
 
diff --git a/dbms/src/Common/ThreadStatus.h b/dbms/src/Common/ThreadStatus.h
index 08b6e2fa969..dbbbfca4988 100644
--- a/dbms/src/Common/ThreadStatus.h
+++ b/dbms/src/Common/ThreadStatus.h
@@ -134,12 +134,8 @@ public:
         return thread_state == Died ? nullptr : logs_queue_ptr.lock();
     }
 
-<<<<<<< HEAD
-    void attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue, LogsLevel client_logs_level);
-=======
     void attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue,
                                      LogsLevel client_logs_level);
->>>>>>> aa54091152... bugfix client logs + some tests
 
     /// Sets query context for current thread and its thread group
     /// NOTE: query_context have to be alive until detachQuery() is called