Modifing .DS_STORE to .DS_Store
fixing merge