removed .DS
merge