Resolve #3553775 "Conflict management api"

Lee Rowlandsrequested to merge
issue/drupal-3553775:3553775-conflict-management-api into main

Closes #3553775

Merge request reports