Category: resolving relationship conflict