Add language-ruby-on-rails package
Fix merge conflict