Fix
Deleted .DS_Store
merge