Resolving conflict and irritation