removed .DS
merged