edit index.html
edit _config.yml
conflict resolved