merged and removed .DS_Store