fix conflict

Signed-off-by: gengliqi <gengliqiii@gmail.com>

dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp

@@ -160,18 +160,8 @@ void ParallelAggregatingBlockInputStream::Handler::onFinish()
 void ParallelAggregatingBlockInputStream::Handler::onException(std::exception_ptr & exception, size_t thread_num)
 {
     parent.exceptions[thread_num] = exception;
-<<<<<<< HEAD
-    /// can not cancel parent inputStream or the exception might be lost
     if (!parent.executed)
-        parent.processor.cancel(false);
-=======
-    Int32 old_value = -1;
-    parent.first_exception_index.compare_exchange_strong(old_value, static_cast<Int32>(thread_num), std::memory_order_seq_cst, std::memory_order_relaxed);
-
-    if (!parent.executed)
-        /// use cancel instead of kill to avoid too many useless error message
         parent.cancel(false);
->>>>>>> 7b280755ba (fix a panic issue in parallel agg when exception is thrown (#5433))
 }