Resolving conflict problem