downgraded ruby
fixed conflict