Resolving Conflicts - Match the Intensity!