Stop disagreement turning into conflict

Stop disagreement turning into conflict