update twitter gemfile version
fixed merge conflicts