as1
Merge remote-tracking branch 'origin/master'
as2
Merge remote-tracking branch 'origin'