Diffuse or defuse the turf war?

A potentially explosive, violent, confrontational or contentious situation is defused.  If it is being diffused, it is slowly spreading and permeating its surroundings.

http://grammarist.com/usage/defuse-diffuse/

(No comment on "Braedley"!)