diff --git a/SOURCES/0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch b/SOURCES/0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch
index 4da0033..501b685 100644
--- a/SOURCES/0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch
+++ b/SOURCES/0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch
@@ -40,8 +40,4 @@ index 51694ac2..30de0275 100644
  }
 
 --
-<<<<<<< HEAD
-2.45.2
-=======
 2.47.0
->>>>>>> ef02e9e (Import from CS git)