remove extraneous arg requirements
Merge remote branch 'origin/master'