Update Gemfile
fix conflict on Gemfile