From e28422bd89f1f22e9f0bdebc391bab802fe7b78b Mon Sep 17 00:00:00 2001
From: Yanxing-Shi <yanxishi@amd.com>
Date: Tue, 27 May 2025 09:33:06 +0000
Subject: [PATCH] fix changelog

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30a4c72610..af50f87c1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,10 +18,7 @@ Documentation for Composable Kernel available at [https://rocm.docs.amd.com/proj
 * Added support for Split K for grouped convolution backward data.
 * Added logit soft-capping support for fMHA forward kernels.
 * Added benchmarking support for tile engine GEMM.
-<<<<<<< HEAD
 * Added profiling cache support for tile engine GEMM.
-=======
->>>>>>> upstream/develop
 
 ### Optimized