try solve conlict b