sublime and rvm
Fix merge conflicts