edit ability.rb
fix conflict