init
index
jekyll build
fixed merge conflict