diff --git a/kernel.spec b/kernel.spec
index 2bda57619..7bf565029 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -23,11 +23,7 @@ Summary: The Linux kernel
 #
 # (Uncomment the '#' and both spaces below to set the buildid.)
 #
-<<<<<<< HEAD
 %define buildid .pnfs35.2010.09.14
-=======
-%define buildid .pnfs35.2010.08.24
->>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
 ###################################################################
 
 # The buildid can also be specified on the rpmbuild command line
@@ -755,11 +751,6 @@ Patch12040: only-use-alpha2-regulatory-information-from-country-IE.patch
 
 Patch12080: kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
 # rhbz #622149
 Patch12085: fix-rcu_deref_check-warning.patch
 Patch12086: linux-2.6-cgroups-rcu.patch
@@ -782,6 +773,7 @@ Patch13602: add-macbookair3-ids.patch
 
 Patch13610: libata-it821x-dump-stack-on-cache-flush.patch
 
+<<<<<<< HEAD
 Patch13630: dm-allow-setting-of-uuid-via-rename-if-not-already-set.patch
 
 Patch13637: dmar-disable-when-ricoh-multifunction.patch
@@ -842,14 +834,6 @@ Patch13703: btrfs-fix-typo-in-fallocate-to-make-it-honor-actual-size.patch
 Patch13704: hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
 
 Patch13000: pnfs-all-2.6.35-2010-09-14-f14.patch
-=======
-=======
->>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
-Patch13000: pnfs-all-2.6.35-2010-08-19.patch
-=======
-Patch13000: pnfs-all-2.6.35-2010-08-24-f14.patch
->>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
->>>>>>> - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
 Patch13001: linux-2.6-pnfs-compile.patch
 Patch13002: linux-2.6.35-inline.patch
 
@@ -1532,6 +1516,12 @@ ApplyPatch add-macbookair3-ids.patch
 # temporary patch, dump stack on failed it821x commands
 ApplyPatch libata-it821x-dump-stack-on-cache-flush.patch
 
+# temporary fix for typo in Xen -stable patch
+ApplyPatch xen-fix-typo-in-xen-irq-fix.patch
+
+# rhbz#641468
+ApplyPatch pnpacpi-cope-with-invalid-device-ids.patch
+
 # rhbz#641476
 ApplyPatch dm-allow-setting-of-uuid-via-rename-if-not-already-set.patch
 
@@ -1593,12 +1583,6 @@ ApplyPatch block-check-for-proper-length-of-iov-entries-earlier-in-blk_rq_map_us
 ApplyPatch hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
 
 ApplyPatch pnfs-all-2.6.35-2010-09-14-f14.patch
-=======
-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
->>>>>>> - 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
 
@@ -2680,14 +2664,6 @@ fi
 - Drop merged patches:
    mm-fix-page-table-unmap-for-stack-guard-page-properly.patch
    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
 
 * Thu Aug 19 2010 Steve Dickson <steved@redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19