update Gemfile.
merge Gemfile.lock