Category: resolving conflict