switched from rvm to rbenv
fixed merge