Bugfix settings.yaml
merge