conflictResolution

How the auto-merging process should resolve conflicts between different profiles.