Change rvm file
Fix Gemfile conflict