using rvm instead of rbenv
fix merge