Issue #3589873: Add configuration to enable conflict resolution per entity type and bundle.

Closes #3589873

Merge request reports

Loading