no more ds_Store
no more ds_store
resolve conflicts