So, you've merged the master branch with itself, and you ended up with a merge commit nobody wanted.
John and Pete are working together on a repo.
$ git log --graph --pretty=oneline --abbrev-commit # an alias I have under 'git lol', but 'gitk' does just fine
* 812492b (master, origin/master, origin/HEAD) Add stuff