Fixed settings.yaml after recent rebase