conflicted resolved