clean up
add ds_store
merge conflict fix