resolved conflicts
conflict resolvs