resole conflict