updated ds store
fixing conflicts