diff --git a/ceph.spec b/ceph.spec
index 57e2393..33c23ca 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -125,11 +125,7 @@
 #################################################################################
 Name:		ceph
 Version:	16.2.7
-<<<<<
 Release:	2
-=======
-Release:	1
->>>>>>> openEuler-22.03-LTS
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 Epoch:		2
 %endif