resovled conflict