diff --git a/sword.spec b/sword.spec
index 1485593..7f07807 100644
--- a/sword.spec
+++ b/sword.spec
@@ -91,14 +91,8 @@ Perl bindings for The SWORD Library.
        -DLIBSWORD_SOVERSION=%{soversion} \
        -DLIBDIR=%{_libdir} \
        -DSWORD_BUILD_TESTS=Yes \
-<<<<<<< HEAD
-       -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" \
-       .. -B .
-make %{?_smp_mflags}
-=======
        -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}"
 %cmake_build
->>>>>>> master
 
 %install
 %cmake_install
@@ -164,12 +158,12 @@ make tests
 * Fri Oct 2 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.903-1
 - Upstream 1.9.0RC3 release
 
-* Fri Sep 11 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.901-1
-- Upstream 1.9.0RC1 release
-
 * Thu Oct 01 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.8.1-25
 - Make the package build with updated %%cmake macro (#1865556)
 
+* Fri Sep 11 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.901-1
+- Upstream 1.9.0RC1 release
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-24
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild