Fixed conflict in .rvmrc file.