Issue #2910910: Add default conflict resolution UI

Merge request reports

Loading