Replace #each_conflict with #conflicts.

This makes sure that users can't modify conflicts while iterating over them.