diff --git a/README.md b/README.md
index 671143f..4daf213 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # mklni
 
 mklni - Image builder for nabu, running in alpine chroot
@@ -23,4 +22,3 @@ mklni - Image builder for nabu, running in alpine chroot
 - Clean build chroots ```sudo ./mklni -c or --cleanup```
 
 - Chroot into ```sudo ./mklni chroot```
->>>>>>> 45494b4 (readme: Add readme)