merge with jekyll