remove .ds_store
merge