add jekyll init
fix conflicts