Add support jekyll
Update a report of jelly fab 18
Fix conflict