removed .DS_Store
removed .DS_Store again
Fixing merge issue?