Merge branch 'master' into branch1
a
Merge remote-tracking branch 'remotes/origin/master' into branch1