Just do this:

    git checkout master

If that hasn't fixed it, this will, but **be careful**, this can make you lose changes. Read the comments below to verify if this applies to you.

    git checkout -b temp
    git branch -f master temp
    git checkout master