DS_Store removed
merge