That merge did something funky. Fixed Gemfile.