ruby version fix
merge