diff --git a/core/kiss/checksums b/core/kiss/checksums
index 91430249..efd28a83 100644
--- a/core/kiss/checksums
+++ b/core/kiss/checksums
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-017a7250a8aa93b7ef542c558220559a3fd7ce6f2c19d80d5e162b8064d40511
-2ccff0e0d00ef8b8959b1b9d2e058a962f7d0854309e6b4fe01ca255c47be1e6
-e6382f351301ac34b5a22d4439de6d4ae9dc8c7296b60ff128657e1d826ebb9d
-=======
 7464abff463701c3b205ade00a5279f7d788380c0534e9d22132922b774b363a
 a3a8af6338ad5e66369765f5dbcdc04c0545d00d3087ecfd6fa0c5ca02b69ef9
 f6d4ddad62c1ae7e4c32b41f6008494ad9ed433092ff83026f2cfaf5a5e94ad2
->>>>>>> master
diff --git a/core/kiss/sources b/core/kiss/sources
index 3366a5b9..c87e697a 100644
--- a/core/kiss/sources
+++ b/core/kiss/sources
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-https://github.com/kisslinux/kiss/archive/5.4.10.tar.gz
-https://github.com/kisslinux/website/archive/8253556796319ad218f773fe066731666e9fde1e.tar.gz docs
-https://github.com/kisslinux/wiki/archive/3726719598b0fadac5ad140492a4bad04cdef372.tar.gz wiki
-=======
 https://github.com/kisslinux/kiss/archive/5.4.11.tar.gz
 https://github.com/kisslinux/website/archive/242b7b60d824f4c8ace259405f602ff05ddfef31.tar.gz docs
 https://github.com/kisslinux/wiki/archive/ad8b8f780f88d50060b1feef88b78528d9abba2e.tar.gz wiki
->>>>>>> master
diff --git a/core/kiss/version b/core/kiss/version
index bf4d8626..95090772 100644
--- a/core/kiss/version
+++ b/core/kiss/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.4.10 2
-=======
 5.4.11 1
->>>>>>> master