- Should be disabled by default, for now, to make it possible to deploy the new conflict resolution interface without the extra auto-resolve feature.
Can be removed after the feature is default everywhere.
Can be removed after the feature is default everywhere.