alt
Merge origin/master