Just do this:

    git checkout master

If you have changes that you want to keep, do this instead:

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