From 9501bc8a7551daa74cd37363b0047bb42c029697 Mon Sep 17 00:00:00 2001
From: Igor Nikonov <igor@clickhouse.com>
Date: Mon, 29 Jul 2024 20:33:06 +0000
Subject: [PATCH] Fix forgotten conflict

---
 src/Processors/QueryPlan/ReadFromRemote.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Processors/QueryPlan/ReadFromRemote.cpp b/src/Processors/QueryPlan/ReadFromRemote.cpp
index cec460ef3bc..3df46eb1987 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.cpp
+++ b/src/Processors/QueryPlan/ReadFromRemote.cpp
@@ -21,13 +21,8 @@
 #include <Client/ConnectionPoolWithFailover.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Parsers/ASTFunction.h>
-<<<<<<< HEAD
 
 #include <fmt/format.h>
-=======
-#include <Storages/MergeTree/ParallelReplicasReadingCoordinator.h>
-#include <boost/algorithm/string/join.hpp>
->>>>>>> origin/master
 
 namespace DB
 {