Committing
Merge origin/master