Neutral 'peace teams' to defuse tension during RNC