Master commit
some commit
Merge branch 'some'
master 2nd commit