Added ConflictType
Modified transaction delegate and retry delegate
updated tests