commit jekyll
fix conflict