Env update
Update gemfile
Update to gemfile merge