diff --git a/.abf.yml b/.abf.yml
index 8d57444..259537c 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,9 +1,5 @@
 sources:
-<<<<<<< HEAD
-  linux-5.12.tar.xz: 3d5a920f1db8fce3dcfd0e0ae18884770f7fb56d
-  patch-5.12.19-xanmod1.xz: 8cf292fa78cbbbe00a1e5bf0a2c1e17a3b27d4d2
-=======
   linux-5.13.tar.xz: 6b79f1a6b6e047cc58509824177d361b4044768a
-  patch-5.13.4-xanmod1.xz: 8e924297a1195e324018ca369b42213252b249df
->>>>>>> rosa2021.1-next
+  patch-5.13.5-xanmod1.xz: 91dd7da234fea7d887903e305341700033bdda99
+
 
diff --git a/kernel-xanmod.config b/kernel-xanmod.config
index 7383ab3..08c1278 100644
--- a/kernel-xanmod.config
+++ b/kernel-xanmod.config
@@ -1,10 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-<<<<<<< HEAD
-# Linux/x86 5.12.19.xm1-10-xanmod-rosa2021.1-x86_64 Kernel Configuration
-=======
 # Linux/x86 5.13.5.xm1-10-xanmod-rosa2021.1-x86_64 Kernel Configuration
->>>>>>> rosa2021.1-next
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0 20210427 (ROSA)"
 CONFIG_CC_IS_GCC=y
diff --git a/kernel-xanmod.spec b/kernel-xanmod.spec
index eba901c..3645d75 100644
--- a/kernel-xanmod.spec
+++ b/kernel-xanmod.spec
@@ -1,11 +1,7 @@
 %define kernelversion	5
 %define patchlevel		13
 # sublevel is used for stable-based kernels
-<<<<<<< HEAD
-%define sublevel		19
-=======
 %define sublevel		5
->>>>>>> rosa2021.1-next
 %define patch_name		xanmod
 %define patch_rel		1