DS store removed
fix merge conflict