rvmrc
merge fix