conlicts cleared