Try to fix config.yml bug
Fix conflict of config.yml