From 98cee8d02b15d69e556a360e13670dbacce46bcd Mon Sep 17 00:00:00 2001
From: coderfeli <coderfeli@163.com>
Date: Tue, 18 Mar 2025 05:45:04 +0000
Subject: [PATCH] fix merge

---
 .../threadwise_tensor_slice_transfer_v7r3_scatter.hpp  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/include/ck/tensor_operation/gpu/thread/threadwise_tensor_slice_transfer_v7r3_scatter.hpp b/include/ck/tensor_operation/gpu/thread/threadwise_tensor_slice_transfer_v7r3_scatter.hpp
index 5acfeada73..0170960c4b 100644
--- a/include/ck/tensor_operation/gpu/thread/threadwise_tensor_slice_transfer_v7r3_scatter.hpp
+++ b/include/ck/tensor_operation/gpu/thread/threadwise_tensor_slice_transfer_v7r3_scatter.hpp
@@ -431,7 +431,6 @@ struct ThreadwiseTensorSliceTransfer_v7r3_scatter
             }
             // copy data from buf_vectors into dst_bufs
             static_for<0, nDst, 1>{}([&](auto i) {
-<<<<<<< HEAD
                 using dst_vector_t      = typename remove_cvref_t<decltype(dst_vectors[i])>::type;
                 IndexType dst_offset         = scatter_offset + (dst_coords_[i].GetOffset());
                 const bool is_dst_valid = dst_offset < dst_descs[i].GetElementSpaceSize();
@@ -441,15 +440,6 @@ struct ThreadwiseTensorSliceTransfer_v7r3_scatter
                     static_cast<InMemoryDataOperationEnum>(DstInMemOps::At(i.value));
                 dst_bufs(i).template Update<DstInMemOp, dst_vector_t>(
                     dst_offset, is_dst_valid, dst_vectors[i].template AsType<dst_vector_t>()[I0]);
-=======
-                using dst_vector_t = typename remove_cvref_t<decltype(dst_vectors[i])>::type;
-                auto dst_offset    = scatter_offset + dst_coords_[i].GetOffset();
-                constexpr InMemoryDataOperationEnum DstInMemOp =
-                    static_cast<InMemoryDataOperationEnum>(DstInMemOps::At(i.value));
-
-                dst_bufs(i).template Update<DstInMemOp, dst_vector_t>(
-                    dst_offset, true, dst_vectors[i].template AsType<dst_vector_t>()[I0]);
->>>>>>> origin/develop
             });
 
             // move coordinate