diff --git a/libyang.spec b/libyang.spec
index 7a8d0f4..a8e080b 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -99,7 +99,6 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
 %files devel-doc
 %{_docdir}/libyang/
 
-<<<<<<< HEAD
 %files cpp
 %{_libdir}/libyang-cpp.so.%{somajor}{,.*}