resolving conflict