error in conf.yml
Merge branch 'develop'