merge master

$ git status
On branch branch2
Your branch is up-to-date with 'origin/branch2'.
nothing to commit, working directory clean
$ git merge master
Auto-merging readme.md
CONFLICT (content): Merge conflict in readme.md
Automatic merge failed; fix conflicts and then commit the result.
$ git diff
diff --cc readme.md
index b251ace,fe268df..0000000
--- a/readme.md
+++ b/readme.md
@@@ -1,3 -1,3 +1,7 @@@
  # gittest

++<<<<<<< HEAD
 +- adding something on **branch2**, would branch1 pull request pick it up? lets see...
++=======
+ - this change was made with **branch1**
++>>>>>>> master