Merge "Clarify how to resolve a uuid collision"