Update _config.yml
Merge local and remote branches