diff --git a/README.md b/README.md
index d0d301c..dbcf818 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,7 @@
 
 Fully open-source operating system from scratch (WIP), released under the GNU GPL version 3.0
 
-<<<<<<< HEAD
 Branch boot : Development focused on the bootloader of OS/K
-=======
-Branch kaleid : Development focused on the Kaleid Kernel.
->>>>>>> kaleid
 
 For changelog, see src/ChangeLog.