fix merge conflict for post/converting-site-to-hugo/index.html
fix merge conflict for post/converting-site-to-hugo/index.html

eorstrom/eorstrom.github.io,eorstrom/eorstrom.github.io,eorstrom/eorstrom.github.io