using jekyll
resolved conflict