Issue #5570: Use new manifest url to resolve conflict