update Gemfile.lock after branch merge