Merge changes to config.yml