Added typed conflict resolution delegate and corresponding processing, marked untyped delegate and methods as obsolete.
Merge pull request #357 from almazik/master

Added typed delegate for conflict resolution and corresponding processing