first commit on branch
commit om master
one more commit on master
Merge branch 'testing'
testing edit
commited to master
is merge going to happen
commit on master
commit on master