Made changes to gemfile
Fixed Gemfile conflict