conflicted resolvedion