diff --git a/SPECS/go-rpm-macros.spec b/SPECS/go-rpm-macros.spec
index 8c6c425..99879be 100644
--- a/SPECS/go-rpm-macros.spec
+++ b/SPECS/go-rpm-macros.spec
@@ -253,7 +253,6 @@ sed -i "s,golist,%{golist_execdir}/golist,g" %{buildroot}%{_bindir}/go-rpm-integ
 %{_spectemplatedir}/*.spec
 
 %changelog
-<<<<<<< HEAD
 * Sun Jan 28 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 3.2.0-3.inferit
 - Drop ix86 arch from exclusive