Ready to merge .DS_Store
remove local .DS_Store