removed DS_Store and syncing with upstream