updates to gemfile
merge