merge into jekyll