branch test
new brance f...
&simple
Merge branch 'feature1'
branch feature1 commit
master commit 1
ok
overbug
merged bug fix