killed .ds_store
merge conflict from amend