jekyll
resolve conflict in gemfile