ending resolving conflict