first level
rest
Merge branch 'master' into team-a
new stuff
merge