Updating excluded files in _config.yml.
Merging jekyll config file conflict.