RESOLVING CONFLICT