jekyll
resolving merge between jekyll and html