?older files?
remove .DS_Store
another commit
fixed merge eror