Botones
Merge origin/master