changed gemfile
fixed merge conflicts