i had a file that was not in git, and yet apparently git somehow effed it up, marking it with some "<<<<< upstream change" stuff. that doesn't make sense since the file was never in git. i'm very confused and quite annoyed.