add .DS_Store
coding
merge