property ConflictDetectionOptions.resolutionStrategy Resolution strategy when auto-resolving Type "keep-block" | "keep-allow" | "keep-first"