Fix conflicts in ruby.el