full
Merge origin/master
d