Fix bad Gemfile after merge conflict.