You have a merge error here. You can fix this by editing the file and deleting 4 out of these 5 lines, to leave just `.DS_Store`. The asterisk is actually unnecessary, because there aren't any filenames OS X generates that have something preceding the letters `.DS_Store`. And, git is smart enough to ignore `.DS_Store` files anywhere in the project, not just the root, so you don't need to add anything special to mark it for ignoring in every directory,