newbranch commit
master commit
goofed
merged
merged