br 1
Merge branch 'master' into br
br 2
Merge branch 'br'