diff --git a/README.md b/README.md
index ecf7683..5f7523a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,5 @@ hallo2
 auch hallo
 test
 zuppa
-<<<<<<< HEAD
 nochmal zuppa
-=======
->>>>>>> 1223f4ad4a01f1766b1836cf6a248fb102154372
+tohl