resoelved conflict