diff --git a/README.md b/README.md
index c6440c4..37dda39 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
 # Think_Python
 This repo contains excercies from a book
 Think Python: How to Think Like a Computer Scientist by Allen B. Downey
+
+bla-bla-bla to test merge conflict resolving in interactive mode