managing conflict

Verified by MonsterInsights