test branch
add line 3 in readme
edit one line on test branch
edited on master branch
after conflict
a test for bugfixstash