fixed gemfile conflicts