updating .ds_store
fix merge
fix merge