[Bug 1897961] Review Request: R-conflicted - An Alternative Conflict Resolution Strategy