diff --git a/check-versioning-lib-release.sh b/check-versioning-lib-release.sh
index b2b5365bef..47c6504fa8 100755
--- a/check-versioning-lib-release.sh
+++ b/check-versioning-lib-release.sh
@@ -25,10 +25,6 @@ crates=(
 "utils/key-utils"
 "roles/roles-utils/network-helpers"
 "roles/roles-utils/rpc"
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 52098db5 (Revert "remove roles from release-libs.yaml")
 "roles/jd-client"
 "roles/jd-server"
 "roles/mining-proxy"