try solve conflct