diff --git a/boost.spec b/boost.spec
index a20a78d..2d635e1 100644
--- a/boost.spec
+++ b/boost.spec
@@ -1145,6 +1145,7 @@ fi
 %{_mandir}/man1/bjam.1*
 
 %changelog
+<<<<<<< openEuler-20.03-LTS-SP1
 * Thu Oct 21 2021 zhangyiru <zhangyiru3@huawei.com> - 1.73.0-6
 - Type:bugfix
 - ID:NA