Updated Gemfile
Fixed Merge