Settings 40%
Merge origin/master
Settings 40%