diff --git a/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch b/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch
index 8dacab7bd..76b39452a 100644
--- a/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch
+++ b/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch
@@ -23,11 +23,7 @@ Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-<<<<<<< HEAD
-@@ -1632,9 +1632,7 @@ static int advk_pcie_enable_phy(struct a
-=======
 @@ -1631,9 +1631,7 @@ static int advk_pcie_enable_phy(struct a
->>>>>>> edeae512c0 (kernel: bump 5.15 to 5.15.63)
  	}
  
  	ret = phy_power_on(pcie->phy);