All commit
Merge origin/master