fixed yaml
merge conflict