RESOLVING CONFLICTS