Made handling of conflicting values more convenient