Resovled conflich