typedef added for onConflict