init jekyll
merge conflict hell