Removed RVM
fixed merge conflict