Added typed conflict resolution delegate and corresponding processing, marked untyped delegate and methods as obsolete.