Update Gemfile.lock

fixing bad merge