merge Gemfile.lock