resole conflicts