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