Have tried git reset --hard
So the resolution for me was:
git reset --hard 4686ae992318eeaaff1945868ee4cc094dcda17d
Wasn't sure where to find the hash, but git put it in the package.json file. I did not alter this file or any other after installing 0.6.0, so I'm very confused about how this conflict arose. The conflicting line was the version number, which in my local file was, apparently, 0.7.0-dev (I believe). Again, no clue how that got in there.