Modified .DS_Store
Merging changes