Remove .DS_Store
Merge Fix