My computer keeps adding this file for some reason, even when I use git checkout -- <file> it adds it again. It does not seem to affect anything, so you can merge the changes, and erase the file.