solving conlict management