Branch commit
master commit
more stuff
Merge with newbranch