fixing mergesd
deleted .ds_store files