Funky conflict removed