add git-extras to install
Merge remote-tracking branch 'origin/master'