Your commit log shows you've pulled in another branch into this.