fix issue with conflicts in gemfile for faraday gem