fix: fix rebase error

Author: Ziminli

src/cuda/rms_norm/kernel.h

@@ -43,37 +43,13 @@ class CudaRmsNorm : public RmsNorm {
           using T = TypeMapType<ListGet<0>(list_tag)>;
           constexpr int kBlockSize = ListGet<1>(list_tag);
 
-<<<<<<< HEAD
-#define LAUNCH_RMS_NORM_KERNEL(BLOCK_SIZE)                                 \
-  RmsNormKernel<BLOCK_SIZE, float, T, T>                                   \
-      <<<num_blocks, BLOCK_SIZE, 0, cuda_stream>>>(                        \
-          reinterpret_cast<T*>(out.data()), stride_out_batch,              \
-          stride_out_nhead, reinterpret_cast<const T*>(input.data()),      \
-          stride_input_batch, stride_input_nhead,                          \
-          reinterpret_cast<const T*>(weight.data()), nhead_, dim_, eps);
-
-          if (block_size == CUDA_BLOCK_SIZE_2048) {
-            LAUNCH_RMS_NORM_KERNEL(CUDA_BLOCK_SIZE_2048)
-          } else if (block_size == CUDA_BLOCK_SIZE_1024) {
-            LAUNCH_RMS_NORM_KERNEL(CUDA_BLOCK_SIZE_1024)
-          } else if (block_size == CUDA_BLOCK_SIZE_512) {
-            LAUNCH_RMS_NORM_KERNEL(CUDA_BLOCK_SIZE_512)
-          } else if (block_size == CUDA_BLOCK_SIZE_256) {
-            LAUNCH_RMS_NORM_KERNEL(CUDA_BLOCK_SIZE_256)
-          } else {
-            LAUNCH_RMS_NORM_KERNEL(CUDA_BLOCK_SIZE_128)
-          }
-
-#undef LAUNCH_RMS_NORM_KERNEL
-=======
           RmsNormKernel<kBlockSize, float, T, T>
               <<<num_blocks, kBlockSize, 0, cuda_stream>>>(
                   reinterpret_cast<T*>(out.data()), stride_out_batch,
                   stride_out_nhead, reinterpret_cast<const T*>(input.data()),
                   stride_input_batch, stride_input_nhead,
                   reinterpret_cast<const T*>(weight.data()), nhead_, dim_,
                   eps_);
->>>>>>> ae94669 (feat: add a convenient interface for any `int64_t`-convertible types and use `DispatchFunc()` to dispatch `DataType` and block sizes with a single call.)
         },
         "CudaRmsNorm::operator()");
   }