diff --git a/README.md b/README.md
index 376bdd8547..9357e436ff 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Cura
 ====