diff --git a/README.md b/README.md
index a237bd3a9656915ac19859f697f32caf8e9739fa..65737746bec1b50a1247850ed84ebc185419bde7 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
-Jordan stinkt
-Daniel auch
\ No newline at end of file
+<<<<<<< README.md
+Jordan stinkt 
+alle stinken 
+>>>>>>> README.md