store update
merge conflict: .DS_Store