fix bad merge of settings.yml