delete .DS_Store
commit before merge/pull