diff --git a/libsvm.spec b/libsvm.spec
index c23d2c8..6503de3 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -81,12 +81,16 @@ Group:      Development/Libraries
 BuildRequires:  java-devel >= 1.5.0
 BuildRequires:  jpackage-utils
 
+<<<<<<< HEAD
 %if 0%{?rhel} <= 6
 Requires:  java >= 1.5.0
 %else
 Requires:  java-headless >= 1.5.0
 %endif 
 
+=======
+Requires:  java-headless >= 1.5.0
+>>>>>>> Use Requires: java-headless rebuild (#1067528)
 Requires:  jpackage-utils
 Requires:       %{name} = %{version}-%{release}
 
@@ -245,7 +249,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-<<<<<<< HEAD
 * Mon Apr 28 2014 Ding-Yi Chen <dchen@redhat.com> - 3.18-2
 - Fixed Bug 1090844 - libsvm-java has unresolved dependencies on epel6 testing
 
@@ -258,8 +261,6 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 3.17-4
 - Use Requires: java-headless rebuild (#1067528)
 
-=======
->>>>>>> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild