git-p4
Merge branch 'origin/master'