diff --git a/kernel.spec b/kernel.spec
index 42d16dbcb..a8c58ccb6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1401,8 +1401,6 @@ ApplyPatch only-use-alpha2-regulatory-information-from-country-IE.patch
 # bz 610941
 ApplyPatch kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 # bz 622149
 ApplyPatch fix-rcu_deref_check-warning.patch
 ApplyPatch linux-2.6-cgroups-rcu.patch
@@ -1464,12 +1462,7 @@ ApplyPatch kvm-fix-fs-gs-reload-oops-with-invalid-ldt.patch
 # CVE-2010-2963
 ApplyPatch v4l1-fix-32-bit-compat-microcode-loading-translation.patch
 
-=======
->>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
-ApplyPatch pnfs-all-2.6.35-2010-08-19.patch
-=======
 ApplyPatch pnfs-all-2.6.35-2010-08-24-f14.patch
->>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
 ApplyPatch linux-2.6-pnfs-compile.patch
 ApplyPatch linux-2.6.35-inline.patch
 
@@ -2351,9 +2344,12 @@ fi
    mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
 * Thu Aug 19 2010 Steve Dickson <steved@redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
+<<<<<<< HEAD
 
 * Thu Aug 19 2010 Steve Dickson <steved@redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
+=======
+>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
 
 * Wed Aug 18 2010 Dave Jones <davej@redhat.com>
 - systemd is dependant upon autofs, so build it in instead of modular.