Remove .DS_Store and duplicates from merge