diff --git a/sdma-dk.spec b/sdma-dk.spec
index 6d29a6d..38769cc 100755
--- a/sdma-dk.spec
+++ b/sdma-dk.spec
@@ -1,6 +1,10 @@
 Name:           sdma-dk
 Version:        1.0.0
+<<<<<<< HEAD
 Release:        4%{?dist}
+=======
+Release:        3%{?dist}
+>>>>>>> e869e8a034d3d4ec309c0d2d3847bcf3b98464db
 Summary:        SDMA user-mode driver
 License:        Apache-2.0
 Source0:        %{name}-%{version}.tar.gz
@@ -37,10 +41,13 @@ find ${RPM_BUILD_ROOT}/%{_libdir}/ -name '*.so*'
 /usr/include/*
 
 %changelog
+<<<<<<< HEAD
 * Sun Sep  15 2024 zhangyuyang <zhangyuyang31@huawei.com> - 1.0.0-4
 - Type:bugfix
 - DESC:fix bug code by review
 
+=======
+>>>>>>> e869e8a034d3d4ec309c0d2d3847bcf3b98464db
 * Wed Sep  11 2024 zhangyuyang <zhangyuyang31@huawei.com> - 1.0.0-3
 - Type:bugfix
 - DESC:add fast mode and fix sdma-dk code