modified in branch dev
new branch branch1
master branch sth changed
Merge branch 'branch1'