updating Gemfile.lock from merge