conflictResolutionPath