settings/settings.json -> .settings.json
Merge remote-tracking branch 'origin/master'