added unique setting and conflict resolution