diff --git a/perl-Text-BibTeX.spec b/perl-Text-BibTeX.spec
index 578dea8..9695a3e 100644
--- a/perl-Text-BibTeX.spec
+++ b/perl-Text-BibTeX.spec
@@ -80,7 +80,6 @@ chrpath -d $RPM_BUILD_ROOT%{_bindir}/*
 %{_libdir}/*.so
 
 %changelog
-<<<<<<< HEAD
 * Sun Jul 15 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 0.85-3.0.riscv64
 - Use lib64 for riscv64