conflicts_spec.rb 2.28 KB