diff --git a/README.md b/README.md
index 9671fe3..8e066e4 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,8 @@
 # dataplay
 ## This is a test :)
+<<<<<<< HEAD                      (merge destination)
+merge conflict
+=======
+lalal merge conflict finally      (merge from)
+>>>>>>> b1
+maybe I should get merge-tools