cleaned up conflicts, need to check if rvm is still working