merge
.ds_store again
merge -_-