use ruby-version instead of .rvmrc
resolve conflict in .ruby-gemset