You might want to remove that `.DS_Store` from the root of the repo and add `.DS_Store` to your global git ignore.