updated gemfile for merge conflicts