All of this extra stuff is a merge error it looks like.