REMOVE ds_store
FIXING merge conflicts