installed jekyll
resolving conflict